test cleanup regarding to issue #2522