Update logging
Update unit tests