Fix 2 test warnings

I've also run the tests and verified in the app that the functionality did not change.