Cleanup warnings in test suite