More tests and first-line-comment fix