This helps to simplify splitting and running tests. Change-Id: I4aaf077df7fd6bd6f14f10cb902850883349eaf5