More lint on unit and functional tests