Simplified a little, added tests that all of numpy ufunc's are covered