add fixes and tests for strict_variables