test & comment block fixes