Fix tests

also updating testing tools