Refactor trap-user tests
Merge pull request #2479 from ironcladlou/dev/v2carts/cuke/trap-user

Merged by openshift-bot