@OtterCode mostlyjason
Modified test suite and updated deps.
8b8ba76