Update unit test following issue #21