Moving test scripts
Fix some bugs
Remove some obsolete values