Cleanup try { FAIL() } catch ( ... ) { } claues, replace them with ENSURE_THROW() in HHashMap tests.