DRY up the add tests