Clean up tests to not generate warnings