Fix some broken tests, adjust comment style