Fixed some bugs with support for data variables
Commented out test code in the parser file
Added misc tests