Add strict_variables support in unit tests