Comments test and code
fixed conflict errors
Merge pull request #19 from Cynaria/commentable_tests

Commentable tests