extended test cases and refactored log messages