Update test case for file NPlusK.hs and related changes