Code base clean up

- Cleaned up tests code base.
- Removed TestHelper usage.