Refactor self & auto grade, Complete auto A & B

A - Type answer / select letters
B - Multiple Choice / True False
C - INCOMPLETE Spinner
D - INCOMPLETE Matching