Stopped the simple interface from detecting keepalive behavour, since this is handled in the main path now. Should deal with #3.
Fixed the test numbering
Force tests to run in order