Fixed and upgraded tests