Added Test features and separate advanced search page