Fix risky unit tests

When running the tests for this project, a lot of noise is generated between deprecation warnings and risk tests that don't have any assertions.

This makes it difficult to read the log, it would be nice if this were clean up to fix all the risky tests.