Adding more test case to link interpreter, and restructuring