Merge two tests
Fix test merge
Run tests in a fixed order