geotests + quickfix
big cleanup