Added validation for step 1, added test that the correct step is loaded