Fixes all but stock movement specs. refs #38