Update dbcs test to have more meaningful messages.
Cleaned up tests.