Add test for exec blocks, minor fix to that feature