Bug fix/99 fix broken rspec tests

@kvirani @fourmojocto @monicao

Fixed all broken rspec tests, with help from Brendan last night.

https://trello.com/c/8uYkk6GL