Cleanup source code #3
QA: Start unit tests enhancements