Stop using a deployment as a creation mechanism for a deployment
Fix broken tests