merged in updated mongodb service and some more tests