Add prompt to test script if limited to a specific org / service
Fix bug in client tests. Fix bug in play 2.2 client with version number