fixes to approach of mocking and added a mock data on contoller