Added rule and test condition classes.