Better discovery of readers
Added base for unittests