Added first phase of untested support for running dynamic tests first then running static tests only if these pass
Resolved merge conflicts