[#264] Additional Shooting test and refactoring