Modified MockKM to suit changes
Amended IW tests more