Modifed entry and exit hooks to work on the components, like every.  Fixed tests.