Remove uses of compose(s) in tests