Fix unit tests
Add missing defaults