Test class updates:
- Addressed warnings.
- Removed unused ref.
- Removed TODOs.