Moved parser into its own file, extended tests
Parser does more parsing