Fix incomplete tests

Change-Id: If46eac0e804ad10dc74cc120125b10510b4770da