Fix comment style and better annotation on expected failure