Add strict_variables check
Fix unit tests