Refactoring numpy tests
Refactoring numpy tests