Ch.3-6 Minor modifications. Updated searchTest with ScalaMock proxies