Fixed smoke tests that broke during a refactor of the snaps-provisioning project.