Added some tests and included some instruction fixes