Add the rest of the tests

Also fix a bug in the include of the tag-comment pattern.