Fix failing basic tests