Minor refactor, added composite receivers test