Fixed test caeses for new hatak and formskit.