Fixing things for test server deployment