Moved more operators and tests to separate files