Updated step1/step2 tests from the training