Fix a couple of warnings in test suite