Correct name.
Add debug support for tests.