It makes more sense to use an independent test for these type of tests.

Change-Id: Ied0cf3e42ccd391594f1dc884617f9dc498e700e