[KFSQA-576] I think it is ready to go. I fixed some style issues and revised one of the steps in the hope that we may be able to refactor it even more to make it a generic lookup-related step.
[KFSQA-576] Removed commented out stuff.