Modified some methods in FakeDatabse