Conintued refactoring tests
Fixed errors in script