Context-Logger
Did some refactoring and added some unit tests.