Initial commit to start the Espresso Tests and merge fixes