upgraded tests and cart