More radical cleanup
Simpler mocha tests on execution and resolution patterns