Fixed some stuff to make tests work with the changes in master
fixed tab/space problem
making suggested changes to code
oops
Merge pull request #5 from Ethcelon/tests

Add Tests