Fix handling of selectors with a single level.
Fix handling of single-level selectors in Interface class, update unit tests.