Finished separation of unit tests for RIO base classes