ASSIST-80 - Removed some misguided changes from a few weeks ago.
ASSIST-80 - Handled RSpec3 deprecation warning.