Chane Unit.str to keep order
Add normalization test