updated affected unit tests as well