Adding Espresso with cross-dependencies