Improved test runners
Fix func args