Refactor some tests
Test using custom set of operators