fixing more test cases to run in the mock db environment