added tests for UC4, fixed numbering