Finished support for R1002-R1017 and corresponding tests