Compositor + Tests corrected, ContextImpl corrected