Cleaning up residual test, using NumPy; minor refactoring