Add test code
Change make-rscode to use make-generic-rscode