More tests

Also:
 - commented out mongodb
 - refactorings refactorings refactoring