Bug fix for body label null; adapted UTs.