It could not be specified in the contructor. Fix #2815
This commit also add some "magic" comments to existing tests so they render correctly. Note that some older commits predates these "magic" comments, which is why they are not there.