Stylistic changes in testlib