rewrote AttributeTest to rely on closures more