Added fix where we mock database