Fix test scripts to work with new convenience functions