Changes from Onsite Tests