- updated to work with latest testing code