Identifier counter resetting (tests simplified, fixed unintended dependencies between tests - damned static vars)