fixed minor concept hierarchy issues, as revealed by tests
expanded test coverage for concept hierarchy