Sync with Test Scripts