fixed failing tests and lint