Fix for service test and script model, factories and validators to make them consistent.