fix tests and lint