Step2 tests tweaks