commit before refactory
updated the test scripts and fixed issues
rm deleted files