[MCC-1312078] Fix/ ports and warnings

This resolves issue #4  and #2, thereby making the test service 10% more awesome.   5% to go!
I'm arguing with myself about how to test this behavior, btw.  Anything jump to mind?