Test deploy refinements

These are a series of refinements as I watch a few people use a test deployment.