Fixing Behavioral/Interpreter tests