More deployment work, and initial test server