Added and modified existing test cases; minor annotations to compiler