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 test cases to ensure it works as expected.
Change-Id: If58071b41c7e69bc182ea033bf647924f996f1f3