Added test class: TestSearch() and test method testAttachPicture(),
refactored some method names to match UML