Remove duplicate code, it is done in the imported test_basic_op
Merge pull request #1640 from nouiz/cleanup

Remove duplicate code, it is done in the imported test_basic_op