Fix bug in recently improved test helpers
Merge pull request #453 from pangratz/fix/bug_in_test_helpers

Fix bug in recently improved test helpers