Added tests and made sure they passed
Merge pull request #7 from RantGames/Test-Fix

Added tests and made sure they passed