Updated parser and tests, no longer including alternates key if no alternates present