Test fixes

Pull in testing changes found while working on rackspace-cloud-backup.

This ran through Jenkins OK up to the tag, which failed as expected.  I didn't bump metadata version as there are no code changes, just test changes and a gem version control change.

```
kitchen              | SUCCESS!
Strainer marked build OK
[PostBuildScript] - Execution post build scripts.
[workspace] $ /bin/sh -xe /tmp/hudson5631402882730839801.sh
+ git reset HEAD --hard
HEAD is now at d8a8a7f CentOS 6.4 deprecated in cloud; move to CentOS 6.5
+ git tag -d jenkins-cookbook-rackspace_cloudmonitoring-44
Deleted tag 'jenkins-cookbook-rackspace_cloudmonitoring-44' (was 2903b20)
+ thor :tag
Untagging: 3.1.2 due to error
fatal: tag '3.1.2' already exists
Increase your version in metadata.rb
```