Improved tests running a bit.