DRY up specs a bit more