cleanup and removing test references from the test script
Adding new files - missed in the prior commit.