fix table names
uncomment some tests
Mockito dependency for failing CI tests