Minor cleanup and added test/server directory.