Improve attribute fixtures