Added comment mocking on backend