testlib; make stylistic changes