Upgraded tests