Rehabilitate non-timing non-redirecting acceptance tests