Simplify the test helper
More tests