FIX issues of previows refactors
Add real output line to implement unittest