Fix classname related failures in tests.