Added tests (require server to be up) and made some syntactic changes to...

... server.py