fixed and re-enabled  broken tests