DEVIDM-115: Moved the mock objects to avoid persisting them