* refactored code to make main unit tests
* finished unit tests for WorkareasSearcher main class
fixed merge problems