Clean up unit tests, todos, assertWithRetries

[austin-denoble]

Problem

There's some TODO comments left in the code. There's also a few things that would be nice to clean up.

Solution

• Clean up TODOs
• Tweak some naming in unit tests
• Clean up assertWithRetries

Type of Change

• [X] Infrastructure change (CI configs, etc)
• [X] Non-code change (docs, etc)

Test Plan

Passing CI