Fix duplicate warnings and update tests.