improve test helpers