comment and fix failing tests