Delete un-used unittest test_issue95 per #585
Add unit test for issue #581.
Merge remote-tracking branch 'origin/dock_refactor' into dock_refactor