got UAM tests to pass
refactored GameServer.java, about to write some tests