cleaner class imports in the test
updating testing script for windows bug