Corrected merge issue and additional tests that use BasStepUtils