Fixed a number of tests for NCI. Now only failing 25/71, better than the 48/71 before. 
Fixed a number of tests for NCI. Now only failing 25/71, better than the 48/71 before. 
ashgti/parrot,ashgti/parrot,ashgti/parrot,ashgti/parrot,ashgti/parrot,ashgti/parrot,ashgti/parrot