[#264] Additional Shooting test and refactoring
Merge pull request #227 from gotar/264-additional-tests-for-shooting

[#264] Additional Shooting test and refactoring