tests: Clean up instance object names that are the same as the class they instance from. #338
Description
As per this discussion instance objects should use a slightly different name than the class name that they are instanced from. Not a big issue at all, just a nit.