Get all test passing

Requires getting the simplification engine
rules cleaned up and made more robust and
extensive