revamp test running structure to run tests interleaved