Fix comment block versions: https://github.com/kmalakoff/knockback/issues/128
Merge tests from develop