Added without_comment test, improved testing