allow subtypes of a binary to be added to a component

- some cleanup
- additional unit tests
+review REVIEW-5192
Add some more coverage for componentbinaries story

+review REVIEW-5192