Merge pull request #664 from joakim-hove/well-shut-test

Well shut test