Cleanup test helpers
Merge pull request #23 from Versal/cleanup-test-helpers

Cleanup test helpers