Finish changes to Instructions, and started fixing test casts