Fixing tests to use scoped class name.