increase performance
restoring tests
add tests for fail
restore tests for always
restore some tests
restore more tests