Add STI, STR, and TRAP instruction tests and fix control sets.