Enh/spmnormalize

fixes to ensure tests pass