Finishing up search class and testing