Updated import paths. Minor changes to test script