Update tests and fix violations