Improve test naming
Remove comments from tests
Test for the 'nocomment', scrub option