FIXED - Kiwi expectations properly defined

Fixes issue #4