tests changed to match code changes