Add some new tests; fix some Comment regressions