Minor fixes
Merge pull request #247 from alxdarksage/refactor-to-test-study

Minor fixes