Changed to advanced search, changed test data