Also split 2 tests off into their correct test classes, this methods are clearly no longer global functions Change-Id: I482433f3099e72507a766e85d9576ff36e58b9ad