Cleanup - Deprecation warning and test output cleanup.