Reorganize test order for synchrony with main code