Refresh test using Interpreter and new logic representation
Debug and final merge with the new logic representation
Remove unused imports