refactor normalize into an iterator that can be plugged into the main bench script
update system tests