Fix tests and tag them for continuous testage

Change-Id: I25d7d34ff8c12308755be6567aae1db009b59a4d
5 files changed