Fix parsing so that tests works.