TestScripts and Bug Fixes