Fix tests and provisioning that were broken when rob's changes were added
Merge pull request #479 from moradology/feature/fix-tests-and-provisioning

Fix tests and provisioning that were broken when rob's changes were added