Changed test ports so won't collide when build on a machine running
tomcat.
Fixing tests, removing hardcoded ports.