#49, bug fixes in validate_service and passing unit tests