Reduce complexity in attribute tests