Fixed linting and test minor faults