Fix for tests that pass through a null or empty body