Use @kedashoe TEST_TYPE concept generically. Rename compose test to compose2 and revert to old compose test.