correcting search url
bug fixes and unit test
removing unused file
adding assert statements
changing assert statements to MS Assert
merging upstream changes