Add a script to test a corner case that may screw up
Clean up comments