Refactoring and adding Company Search - Testing