Update to attrs, fix kitchen sink spec