More coverage and improvements for trait specs.