Fixed extensive logging for coverage.
Merge branch 'test' into dev