Finished tests.  Need to review code to remove duplicate inner search code

USERGRID-55