More tests for numpy_support, and some refactor