Fix #23: Improve unit tests.