fixed symbol converter, new test cases, refactoring