[BUG #8678] Fixed tests