Fixing failing tests after merging master (Part II).