Fix generated service classes, fix tests in StudyDataRequestDecorator, fix small bug