Remove logger and fix tests