An issue was discovered if we mock an already mock-ed function. This
was happening in our execute() detection code. Change it to not use a
mock and instead a function.
Add unit tests to show it works as intended.
Change-Id: Ia116b355e7adb3cbfb8ae34f4d59bf527f2889bb
