Updated DB to return whole instance at add. It's required to refactor a lot in test code