Adding in operator support with tests.