Merging @gfxmonk's exec tests