expanded some unit tests