Fix respond_with issues (note to self - stop refactoring when there are no tests)