fix the broken tests as a result of commit b86eea4