update mocking with load-from-db changes