Added test for bad symbols
Cleaned up code - removed old stuff