Updated some unit tests