intermediate commit with a couple of broken tests