Removed symbol table, added tests