Revert "Merge branch 'test_helpers' into wamp2"

This reverts commit 58f6d3987a885f46e0da002fae79694c6154c70e, reversing
changes made to aa4e1cfb58711a6c81241dd6fde2629e4153837d.