Tweak and re-run  unit tests