Updated sequencing of tests