operator - cleanup and more tests - intermediate