Modernize the toggle tests

Also brought in line with the code conventions.

Change-Id: I0757813ba0a6449977b906d4538371041b91ca2f
Merge "Modernize the toggle tests"