server module refactored
server module added more test