Populate the normalisation map for restiming data.
Fix some small issues picked up by the unit tests.
Fix some of the broken unit tests.