Added abbr property.  Removed test code.