Making the unit and integration tests pass