David Ffrench a good part of it I already did here https://github.com/aerogear/mobile-security-service/pull/72.
I will finish it in another task. Has more 2 or 3 tests to replace because they are with asserts and need to remove the desc with asserts from the readme. I will do it tomorrow.