Adding more unit tests, can not reproduce issue #43