Test Homepage_V6 fixes