Fixing Searchbar and Fixing storing of test code