Fix #18: Update unit tests.