Added Tests for newly implemented features, Added search functionality