added test, fixed cherry locator implementation