Eliminated potentially confusing static variable.
- Expanded tests.