Consolidated tests and moved to running: