Add Guard for rspec test notifications. Update to fix some failures