Remove unused code and fix a couple of tests
Fixed some more tests
Merge branch 'unittests' into viasat