Fix tests, remove over-ambitious startup detection from test runner