Acceptance tests

Fixes #315.
Don't use the same port for both of these, otherwise you're not covering case where they get swapped somehow somewhere.