More style changes, adding test server