Fix up dummy classes in tests