Separate functions into celestial vs non-celestial pixel scale and fix tests