Created search acceptance test
fixed merge conflicts between master and search branches