start simplify next_test (removed 1 if-then level, causing lots of whitespace changes)