Add test for comments and bugfix