upgraded tests