Issue #65 and issue #66. End of test instability.