Simplify a test signature to avoid *arg passing