Changed test config to use annotations instead.  Makes graph integration easier