Lint channel class
Fix broken tests