Tidy tests

Cleaned up a ton of warnings when running the unit tests. There's still a handful left, but I'm happy to call this done for now and move on.