Interpreter tests, interpreter bug fix

Interpreter now just needs