adding server tests and start converting to httpretty