Use mockito
A bit more tests