More helper and tests