Move key to TyphoonDefinition+Infrastructure
Add test pods.