Add more binop tests + refactor