Update tests to meet linting checks