Added components for local interruptible, but syntax commented out in grammer file, so can't test for now. Fixed some of the tests