Fix incorrect method name causing test failures.
Add more diagnostics to tests.