changed parser token, updated unittest to reflect
Added some extra unittests