More extensive unit tests