Eliminate warnings in tests as reported in #1313