Fix unit test (still fails for creating duplicate fields on different steps)