(MODULES-1571) change exec and html to use exec

This means we can mock and spec easier