Added more tests; Added provisional Mongo support