Update related unit tests