Updated the script name.  Also added some UnitTests.