Finish splitting tests for refactored operations