All but 2 tests passing up to Step._make_replacements() using newly parameterized fixtures.