Update tests, removed mockito dependency