Continue making steps generic when possible.
remove unused step
Consolidate some more test code.