Avoid warnings, correct tests.