fix lint and unit tests