Fixed logging, tests, finder