Add a few new instruction types and improve testing