Changes to keep the test from quitting