Fixed a problem and added more unit tests

Fixed an overlooked issue in Interpreter;
Added some unit tests for Interpreter;