Merge pull request #73 from RonPasquarelli/master

Corrected merge issue and additional tests that use BasStepUtils