[V1S2] orphan concepts unit tests and enhancements