Remove RSpec3 warnings

@alexdavid please review. The RSpec3 way is actually a lot clearer and better. These guys keep pushing the envelope.