MSINM-64: Fix test issues ... methinks!