[minor] Fixing some comments and adjusting adapter tests