Don't conflict with HATests, remove pointless sleeps, clean up escaping a little.