included test-tidy suggestions