revert method body to previous state.
add creators for composite conditions and tests for them.