Added initial search method and test