Most attribute tests now passing