Update the usage of counters.
Updated the unit tests with the new counters.
Refactored behavior descriptor to own module.