Minor corrections and tests for assembler.

Comments out most breaking code from assembler, this will need
rearranging to enable the tests to run safely.