Now you can use variables in state.json

Also start cleaning up test_apply so it drops less files in /tmp that need
to be manually cleaned up by the test.