A new normal refinement routine (#996)

A new normal refinement routine (#996)

- and the unit test