change setup file and rename test scripts