Implement DUP1-16 and unit tests