Merge and correct all tests.

in 1 minute and 37 seconds, using 0 compute credits, and was queued for 3 seconds