some unit tests improved