Fix execution and add a spec