Fixed issue with mock objects