logging and test class adapted