fix for missing scipy check
Changed matching to have 3d and sky versions
correct tests for 3d and sky matching and related fixes