Adding a ModelOfCondition and refactored ModelofAction
Adding some tests