MongoDB support part 11
Migrating to Spek
Minor refactorings