Fixed code coverage issues.
Added some logging to ease transition between platforms.