Started cleaning up and unit testing AttributeImplementor