Check for query parameter when searching; updating to Rspec v3 syntax

Fixes #65 and updates tests to the new RSpec v.3 syntax