fix tests broken by duplicated message bug fix
fix tests broken by duplicated message bug fix