making things a little cleaner.
new tests since @rjames86 found a bug in the parser for a previous version, need to make sure things work correctly.