Fix failing rspec tests for enabled STRICT_VARIABLES