FIX Move normal orientation picking after noise norm calculation

Further ensures consistency with minimum_norm solution and fixes test for
normal orientation solution being precisely smaller than the free orientation
solution.