Remove more tests that are failing

Change-Id: I23aaceca6df5f13eefe3cc0bd52daf670d359a56