6 files changed, 13 insertions, 12 deletions
diff --git a/client/go/jvm/application_container.go b/client/go/jvm/application_container.go
index 1cbc8877aa3..b7c9a88b5fd 100644
--- a/client/go/jvm/application_container.go
+++ b/client/go/jvm/application_container.go
@@ -45,7 +45,7 @@ func (a *ApplicationContainer) Discriminator() string {
 
 func (a *ApplicationContainer) addJdiscProperties() {
 	cfgId := a.ConfigId()
-	opts := a.jvmArgs
+	opts := a.jvmOpts
 	opts.AddCommonJdiscProperties()
 	containerParentDir := defaults.UnderVespaHome("var/jdisc_container")
 	containerHomeDir := fmt.Sprintf("%s/%s", containerParentDir, a.Discriminator())
@@ -104,7 +104,7 @@ func (a *ApplicationContainer) configureMemory(qc *QrStartConfig) {
 		jvm_directMemorySizeCache = 0
 	}
 	maxDirectMemorySize := jvm_baseMaxDirectMemorySize + (jvm_heapsize / 8) + jvm_directMemorySizeCache
-	opts := a.jvmArgs
+	opts := a.jvmOpts
 	opts.AddOption(fmt.Sprintf("-Xms%dm", jvm_minHeapsize))
 	opts.AddOption(fmt.Sprintf("-Xmx%dm", jvm_heapsize))
 	opts.AddOption(fmt.Sprintf("-XX:ThreadStackSize=%d", jvm_stacksize))
diff --git a/client/go/jvm/container.go b/client/go/jvm/container.go
index 53ff9f9a809..fd65602e573 100644
--- a/client/go/jvm/container.go
+++ b/client/go/jvm/container.go
@@ -25,7 +25,7 @@ type Container interface {
 type containerBase struct {
 	configId    string
 	serviceName string
-	jvmArgs     *Options
+	jvmOpts     *Options
 	propsFile   string
 }
 
@@ -34,7 +34,7 @@ func (cb *containerBase) ServiceName() string {
 }
 
 func (cb *containerBase) JvmOptions() *Options {
-	return cb.jvmArgs
+	return cb.jvmOpts
 }
 
 func (cb *containerBase) ConfigId() string {
diff --git a/client/go/jvm/options_test.go b/client/go/jvm/options_test.go
index cfb4e90d5e5..a2763223611 100644
--- a/client/go/jvm/options_test.go
+++ b/client/go/jvm/options_test.go
@@ -15,7 +15,7 @@ func (*dummyContainer) exportExtraEnv(ps *prog.Spec) {}
 func newDummyContainer() Container {
 	var dc dummyContainer
 	dc.serviceName = "foo"
-	dc.jvmArgs = NewOptions(&dc)
+	dc.jvmOpts = NewOptions(&dc)
 	return &dc
 }
 
diff --git a/client/go/jvm/run.go b/client/go/jvm/run.go
index d0ce2f72988..eb728cabdea 100644
--- a/client/go/jvm/run.go
+++ b/client/go/jvm/run.go
@@ -27,7 +27,7 @@ func NewApplicationContainer(extraArgs []string) Container {
 	var a ApplicationContainer
 	a.configId = os.Getenv(envvars.VESPA_CONFIG_ID)
 	a.serviceName = os.Getenv(envvars.VESPA_SERVICE_NAME)
-	a.jvmArgs = NewOptions(&a)
+	a.jvmOpts = NewOptions(&a)
 	a.configureOptions()
 	for _, x := range extraArgs {
 		a.JvmOptions().AddOption(x)
diff --git a/client/go/jvm/standalone_container.go b/client/go/jvm/standalone_container.go
index 33007862f58..06d8f041169 100644
--- a/client/go/jvm/standalone_container.go
+++ b/client/go/jvm/standalone_container.go
@@ -33,7 +33,7 @@ func (a *StandaloneContainer) ConfigId() string {
 }
 
 func (a *StandaloneContainer) configureOptions() {
-	opts := a.jvmArgs
+	opts := a.jvmOpts
 	opts.ConfigureCpuCount(0)
 	opts.AddCommonXX()
 	opts.AddOption("-XX:-OmitStackTraceInFastThrow")
@@ -52,7 +52,7 @@ func (a *StandaloneContainer) configureOptions() {
 func NewStandaloneContainer(svcName string) Container {
 	var a StandaloneContainer
 	a.serviceName = svcName
-	a.jvmArgs = NewOptions(&a)
+	a.jvmOpts = NewOptions(&a)
 	a.configureOptions()
 	return &a
 }
diff --git a/client/go/util/fix_fs_test.go b/client/go/util/fix_fs_test.go
index 8696359ea19..1f0d317957d 100644
--- a/client/go/util/fix_fs_test.go
+++ b/client/go/util/fix_fs_test.go
@@ -2,9 +2,9 @@
 package util
 
 import (
-	"fmt"
 	"os"
 	"os/user"
+	"path/filepath"
 	"strconv"
 	"testing"
 
@@ -13,7 +13,8 @@ import (
 )
 
 func setup(t *testing.T) string {
-	tmpDir := t.TempDir()
+	tt := t.TempDir()
+	tmpDir, _ := filepath.EvalSymlinks(tt)
 	err := os.MkdirAll(tmpDir+"/a", 0755)
 	assert.Nil(t, err)
 	err = os.MkdirAll(tmpDir+"/a/bad", 0)
@@ -81,7 +82,7 @@ func TestSimpleFixes(t *testing.T) {
 }
 
 func TestSuperUserOnly(t *testing.T) {
-	trace.AdjustVerbosity(2)
+	trace.AdjustVerbosity(0)
 	var userId int = -1
 	var groupId int = -1
 	if os.Getuid() != 0 {
@@ -118,7 +119,7 @@ func TestSuperUserOnly(t *testing.T) {
 func expectSimplePanic() {
 	if r := recover(); r != nil {
 		if jee, ok := r.(*JustExitError); ok {
-			fmt.Fprintln(os.Stderr, "got as expected:", jee)
+			trace.Trace("got as expected:", jee)
 			return
 		}
 		panic(r)