Fixed parser bug where operator tokens weren't getting consumed
Updated tests