* More unit tests