Fixed a bug regarding adding comments after the body
Added more tests.