Fix a warning in release builds and a test case I forgot to update with