More testing and scripting