fix lint
fix tests, misc cleanup