Instead of having a 30-second timer be the only way to end the test, add a 2 second shutdown timer when the test is actually about to be over.