Upgraded doubleshot and test suite for proper exit code