Partial fixes
Failing on conformer reordering
Update tests