[1680] Correcting test passing problems