New style zero-role testing

Change-Id: Ie11218d454468bdf99e9c202b947fd704f4396a8