Added test helpers.
Simpler test helper.