Fix minor bug in comment parsing + add some tests for comments
11 files changed