Tidy up, and had 2 assertions incorrectly commented out.