Fixing tests and instruction generation.