Breaking out server creation into its own func + adding more tests