updating test scripts
merging with new structure
updating gitignore