Updated to support overriding the mountpoint being used by the test program