fix lint
fix tests