Fix some unit tests
Merge branch 'master' into viasat