Fix espresso tests