Fixing tests, and ignoring the ones that can not be fixed.

Change-Id: I81648582687119904e44a66258760e093cab05e0