Fix some regressions in tests
Replace convert command test tags