Slim down the organizer unit tests to reflect the rollback refactoring