bug 1072493 - More syntax improvements to tests