cleaned up old tests
Merge pull request #20 from wick-ed/master

cleaned up old tests
Merge with master
Remove unnecessary test files
Bugfixing