Clean up some warnings in test