Update testing tools

WIP