Removed un needed block from search, moved system method/locators to test