Added tests with mockito, @Inject annotation, organising imports, formatting code