changed back a few __class__ tests to __class__.__name__ to avoid having to deal with those pesky namespaces