Added tests/fixed code for Delta. Also pulled out a couple of things into their own strategies.
resolved merge conflict