Update Remove composition test suite