Improved unit tests (KIF & Kiwi)