Refactored attribute test to deal with new types.