Added composition tests.