Refactor WingParser and Test