Migrate CompositionTest class to FU 4
Remove some unused imports