Merge pull request #182 from gilles-leblanc/feature

Replaced deprecated mock and any_number_of_times that were used by RSpec mocks