Parser tests - changed expected output to match what the new parser actually produces, added some simple test cases.