Making some unit tests better