Allow shell test to be excluded and cleanup ready for pull request