operator tests and bugfixes