Cleaned up some server-side testing