Rewritting so that each test is an individual test.