More tweaks to testing

Refactored the test executor

Rejig tests