uc2otus: refactored; tests