Unit testing

This haunts me every night
Merge pull request #2 from Fuzzy0111/master

Unit testing