corrected errors
added Composite classes
added Operation to simple concrete test classes