* Raise ServiceValidationError on invalid select option * Fix tests * Correct place holders * More test fixes