strict tests, cleanup