Add more tests, break up array tests, fix tests

Implement prototype instruction removal, rather than nopping everything.