Some more test helpers to DRY up implementation from specs