Consolidate and extend instruction form tests
Fix a few typos in assembly generation