Update some unit tests