UPC-10 Add tests