Testing - some upgrades