Fix tests and modify Interpreter internals
Create a bunch of tests for evaluator