More tests, Added Categories to search, Search expands