Fill in some unit tests