Updated test cases
Removed Apiary URL
Refactored to use a base class
Added keyword searches