more test fixes because changed comment style