Fix #148 and subsequent issues; verify BlockHardness coverage