Ch.3-6 Added searchTest. Minor changes to search. Added ScalaMock dependency