Simple logging added
Simple logging added
Tests refactoring