Move token cleaning to new method.
FixedUID parser test class will not pre-clean uid tokens.
Update test cases.