Improve failing tests for issue #66