Everything now testable excpet Composite