Unit tests for both types of C-instructions; fixed some minor bugs