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

Trivial, important - merging immediately