Merge pull request #1 from raderj89/chore/testing

Chore/testing
Merge pull request #2 from raderj89/master

Merge pull request #1 from raderj89/chore/testing