Correcting a few tests

Also excluded 3 tests as we cannot skip a single item in a data-driven
set.

Change-Id: I3ebe97d22e12ad11f3caf16fca0d380092e952c6