New bugfix in search algorithm; formated source; updated testData