Improve validation of client_integration_id

Also upgrade rspec to 3.0