I have removed a not relevant test on pre-execute causing a lot of problems