More testing and fixes in the normalization command.