Fixed remaining test issues.
Added logging