Add strict variables tests
Fix unit tests
Add missing defaults