Improve MockFactory.makeMockDb()

-Does proper validation now