Made backend tests pass