fix tests with helpers