Fix SHCal tests

This should fix the 138xx and 148xx tests that are currently failing in step 1.  They'll fail in step 2 though.
Moved two files to what they're called in the python files.  Decided to move them rather than change the python config because the names will then match the tapered version.