Removed deprecated workaround in Haff::calculate().
Adapted test for Haff::suppressedInsertion().