Needlessly refactor tests
Needlessly refactor core compose fn