Remove unused code and fix a couple of tests
Fixed some more tests
Commented out wrong test
Merge branch 'unittests'