removed "AdnoTest" module
Review. TODOS added
refactoring