Update Rspec expect syntax; allow non-template message