Cleaned up workign directory and modified test script