Clean up makedelta system a bit
Adjust the makedelta tests