Spec helper updates for more consistency