Simplify tests -- no need to keep track of host/port
Add more tests