tests upgrade, fixes