Add some cleanup and change the names for the integration test data so it doesn't conflict with the other data I'm using.
Make the Spring injection of Client and Authorization connector optional. Suitable defaults can be supplied.