Added more tests
Removed debugging and whitespace
Merge branch 'master' of github.com:jonasmarcello/Wigfiles