Zocalo patch and test class package change.