Test improve

This one is rebase on numpy_expr as some bugs were already fix
It works for both