No attributelist (or empty) => normal discovery
Added tests for new functionality