Fix lint issues in unit tests