update to testing.  still not as robust as I would like, but better