Improve execution tests