Clean up, and adding back masking to aperture_photomery and some checks in CircularAperture
WIP: Changing tests due to api change