use a single pass to compile
fix quoting unit test
Fix remaining unit tests