updated values and units tests