opt: neaten tests with helpers.