diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIAsyncClientTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIAsyncClientTest.java
index 9c24194bda..f7e08941bc 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIAsyncClientTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/AMIAsyncClientTest.java
@@ -222,7 +222,7 @@ public class AMIAsyncClientTest extends RestClientTest<AMIAsyncClient> {
 
    public void testRegisterImageBackedByEBS() throws SecurityException, NoSuchMethodException,
             IOException {
-      Method method = AMIAsyncClient.class.getMethod("registerImageBackedByEbsInRegion",
+      Method method = AMIAsyncClient.class.getMethod("registerUnixImageBackedByEbsInRegion",
                Region.class, String.class, String.class, Array.newInstance(
                         RegisterImageBackedByEbsOptions.class, 0).getClass());
       GeneratedHttpRequest<AMIAsyncClient> httpMethod = processor.createRequest(method,
@@ -243,7 +243,7 @@ public class AMIAsyncClientTest extends RestClientTest<AMIAsyncClient> {
 
    public void testRegisterImageBackedByEBSOptions() throws SecurityException,
             NoSuchMethodException, IOException {
-      Method method = AMIAsyncClient.class.getMethod("registerImageBackedByEbsInRegion",
+      Method method = AMIAsyncClient.class.getMethod("registerUnixImageBackedByEbsInRegion",
                Region.class, String.class, String.class, Array.newInstance(
                         RegisterImageBackedByEbsOptions.class, 0).getClass());
       GeneratedHttpRequest<AMIAsyncClient> httpMethod = processor.createRequest(method,
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreAsyncClientTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreAsyncClientTest.java
index bf5c016308..089fcdb3f1 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreAsyncClientTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/ElasticBlockStoreAsyncClientTest.java
@@ -39,6 +39,7 @@ import org.jclouds.aws.ec2.EC2;
 import org.jclouds.aws.ec2.domain.AvailabilityZone;
 import org.jclouds.aws.ec2.domain.Region;
 import org.jclouds.aws.ec2.filters.FormSigner;
+import org.jclouds.aws.ec2.functions.ReturnVoidOnVolumeAvailable;
 import org.jclouds.aws.ec2.options.CreateSnapshotOptions;
 import org.jclouds.aws.ec2.options.DescribeSnapshotsOptions;
 import org.jclouds.aws.ec2.options.DetachVolumeOptions;
@@ -202,9 +203,9 @@ public class ElasticBlockStoreAsyncClientTest extends RestClientTest<ElasticBloc
       assertPayloadEquals(httpMethod,
                "Version=2009-11-30&Action=DetachVolume&Force=false&VolumeId=id");
 
-      assertResponseParserClassEquals(method, httpMethod, ParseSax.class);
-      assertSaxResponseParserClassEquals(method, AttachmentHandler.class);
-      assertExceptionParserClassEquals(method, null);
+      assertResponseParserClassEquals(method, httpMethod, ReturnVoidIf2xx.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertExceptionParserClassEquals(method, ReturnVoidOnVolumeAvailable.class);
 
       checkFilters(httpMethod);
    }
@@ -225,9 +226,9 @@ public class ElasticBlockStoreAsyncClientTest extends RestClientTest<ElasticBloc
                httpMethod,
                "Version=2009-11-30&Action=DetachVolume&Force=true&VolumeId=id&InstanceId=instanceId&Device=%2Fdevice");
 
-      assertResponseParserClassEquals(method, httpMethod, ParseSax.class);
-      assertSaxResponseParserClassEquals(method, AttachmentHandler.class);
-      assertExceptionParserClassEquals(method, null);
+      assertResponseParserClassEquals(method, httpMethod, ReturnVoidIf2xx.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertExceptionParserClassEquals(method, ReturnVoidOnVolumeAvailable.class);
 
       checkFilters(httpMethod);
    }
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/CreateRunScript.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/CreateRunScript.java
index 1fc7a833b2..2bba7f57a3 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/CreateRunScript.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/CreateRunScript.java
@@ -153,7 +153,9 @@ public class CreateRunScript implements Statement {
             statements.add(appendToFile(line, runScript, family));
       }
       statements.add(new AddTitleToFile(instanceName, runScript));
-      statements.add(appendToFile(Utils.writeZeroPath(family), runScript, family));
+      statements
+               .add(appendToFile(Utils.writeZeroPath(family).replace(ShellToken.LF.to(family), ""),
+                        runScript, family));
       statements.add(new AddExportToFile("instanceName", instanceName, runScript));
       for (String export : exports) {
          statements.add(new AddExportToFile(export, Utils.replaceTokens("{varl}"
diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/InitBuilderTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/InitBuilderTest.java
index 77d28290f9..e013a7b738 100644
--- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/InitBuilderTest.java
+++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/InitBuilderTest.java
@@ -76,7 +76,7 @@ public class InitBuilderTest {
                         "yes| mkfs -t ext3 {varl}EBS_DEVICE{varr} 2>&-",
                         "mount {varl}EBS_DEVICE{varr} {varl}EBS_MOUNT_POINT{varr}",
                         "echo making a local working copy of the boot disk",
-                        "rsync -ax --exclude=/mnt/* --exclude=/proc/* --exclude=/tmp/* --exclude=/dev/log / {varl}IMAGE_DIR{varr}",
+                        "rsync -ax --exclude /ubuntu/.bash_history --exclude /home/*/.bash_history --exclude /etc/ssh/ssh_host_* --exclude /etc/ssh/moduli --exclude /etc/udev/rules.d/*persistent-net.rules --exclude /var/lib/ec2/* --exclude=/mnt/* --exclude=/proc/* --exclude=/tmp/* --exclude=/dev/log / {varl}IMAGE_DIR{varr}",
                         "echo preparing the local working copy",
                         "touch {varl}IMAGE_DIR{varr}/etc/init.d/ec2-init-user-data",
                         "echo copying the local working copy to the ebs mount",
diff --git a/scriptbuilder/src/test/resources/test_ebs.sh b/scriptbuilder/src/test/resources/test_ebs.sh
index 4ef6b68fd5..8c14325dfb 100755
--- a/scriptbuilder/src/test/resources/test_ebs.sh
+++ b/scriptbuilder/src/test/resources/test_ebs.sh
@@ -9,7 +9,7 @@ function abort {
 }
 function default {
    export INSTANCE_NAME="mkebsboot"
-export INSTANCE_HOME="/mnt/tmp"
+export INSTANCE_HOME="/tmp"
 export LOG_DIR="/tmp/logs"
    return 0
 }
@@ -54,7 +54,7 @@ function forget {
    }
    return 0
 }
-export PATH=/usr/ucb/bin:/bin:/usr/bin:/usr/sbin
+export PATH=/usr/ucb/bin:/bin:/sbin:/usr/bin:/usr/sbin
 case $1 in
 init)
    default || exit 1
@@ -66,22 +66,33 @@ init)
    echo 'shopt -s xpg_echo'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'shopt -s expand_aliases'>>$INSTANCE_HOME/mkebsboot.sh
    echo "PROMPT_COMMAND='echo -ne \"\033]0;mkebsboot\007\"'">>$INSTANCE_HOME/mkebsboot.sh
+   echo 'export PATH=/usr/ucb/bin:/bin:/sbin:/usr/bin:/usr/sbin'>>$INSTANCE_HOME/mkebsboot.sh
    echo "export INSTANCE_NAME='mkebsboot'">>$INSTANCE_HOME/mkebsboot.sh
    echo "export IMAGE_DIR='$IMAGE_DIR'">>$INSTANCE_HOME/mkebsboot.sh
    echo "export EBS_DEVICE='$EBS_DEVICE'">>$INSTANCE_HOME/mkebsboot.sh
    echo "export EBS_MOUNT_POINT='$EBS_MOUNT_POINT'">>$INSTANCE_HOME/mkebsboot.sh
+   echo "export INSTANCE_NAME='$INSTANCE_NAME'">>$INSTANCE_HOME/mkebsboot.sh
+   echo "export INSTANCE_HOME='$INSTANCE_HOME'">>$INSTANCE_HOME/mkebsboot.sh
+   echo "export LOG_DIR='$LOG_DIR'">>$INSTANCE_HOME/mkebsboot.sh
    echo 'cd $INSTANCE_HOME'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'echo creating a filesystem and mounting the ebs volume'>>$INSTANCE_HOME/mkebsboot.sh
-   echo 'mkdir -p $EBS_MOUNT_POINT'>>$INSTANCE_HOME/mkebsboot.sh
-   echo 'mkfs.ext3 $EBS_DEVICE'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'mkdir -p $IMAGE_DIR $EBS_MOUNT_POINT'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'rm -rf $IMAGE_DIR/*'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'yes| mkfs -t ext3 $EBS_DEVICE 2>&-'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'mount $EBS_DEVICE $EBS_MOUNT_POINT'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'echo making a local working copy of the boot disk'>>$INSTANCE_HOME/mkebsboot.sh
-   echo 'rsync --stats -av --exclude /root/.bash_history --exclude /home/*/.bash_history --exclude /etc/ssh/ssh_host_* --exclude /etc/ssh/moduli --exclude /etc/udev/rules.d/*persistent-net.rules --exclude /var/lib/ec2/* --exclude=/mnt/* --exclude=/proc/* --exclude=/tmp/* / $IMAGE_DIR'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'rsync -ax --exclude /ubuntu/.bash_history --exclude /home/*/.bash_history --exclude /etc/ssh/ssh_host_* --exclude /etc/ssh/moduli --exclude /etc/udev/rules.d/*persistent-net.rules --exclude /var/lib/ec2/* --exclude=/mnt/* --exclude=/proc/* --exclude=/tmp/* --exclude=/dev/log / $IMAGE_DIR'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'echo preparing the local working copy'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'touch $IMAGE_DIR/etc/init.d/ec2-init-user-data'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'echo copying the local working copy to the ebs mount'>>$INSTANCE_HOME/mkebsboot.sh
-   echo 'tar -cSf - -C ./ . | tar xvf - -C $EBS_MOUNT_POINT'>>$INSTANCE_HOME/mkebsboot.sh
-   echo 'unmount $EBS_MOUNT_POINT'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'cd $IMAGE_DIR'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'tar -cSf - * | tar xf - -C $EBS_MOUNT_POINT'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'echo size of ebs'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'du -sk $EBS_MOUNT_POINT'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'echo size of source'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'du -sk $IMAGE_DIR'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'rm -rf $IMAGE_DIR/*'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'umount $EBS_MOUNT_POINT'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'echo ----COMPLETE----'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'exit 0'>>$INSTANCE_HOME/mkebsboot.sh
    chmod u+x $INSTANCE_HOME/mkebsboot.sh
diff --git a/scriptbuilder/src/test/resources/test_find_pid.sh b/scriptbuilder/src/test/resources/test_find_pid.sh
index 4a0f92692b..e3364ce2de 100644
--- a/scriptbuilder/src/test/resources/test_find_pid.sh
+++ b/scriptbuilder/src/test/resources/test_find_pid.sh
@@ -22,7 +22,7 @@ function findPid {
       return 1
    }
 }
-export PATH=/usr/ucb/bin:/bin:/usr/bin:/usr/sbin
+export PATH=/usr/ucb/bin:/bin:/sbin:/usr/bin:/usr/sbin
 findPid $@ || exit 1
 echo $FOUND_PID
 exit 0
diff --git a/scriptbuilder/src/test/resources/test_init.cmd b/scriptbuilder/src/test/resources/test_init.cmd
index c03984bd27..1f5838b9a7 100644
Binary files a/scriptbuilder/src/test/resources/test_init.cmd and b/scriptbuilder/src/test/resources/test_init.cmd differ
diff --git a/scriptbuilder/src/test/resources/test_init.sh b/scriptbuilder/src/test/resources/test_init.sh
index 636200b733..917baa4fee 100755
--- a/scriptbuilder/src/test/resources/test_init.sh
+++ b/scriptbuilder/src/test/resources/test_init.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -u
+set +u
 shopt -s xpg_echo
 shopt -s expand_aliases
 unset PATH JAVA_HOME LD_LIBRARY_PATH
@@ -52,7 +52,7 @@ function forget {
    }
    return 0
 }
-export PATH=/usr/ucb/bin:/bin:/usr/bin:/usr/sbin
+export PATH=/usr/ucb/bin:/bin:/sbin:/usr/bin:/usr/sbin
 case $1 in
 init)
    default || exit 1
@@ -60,10 +60,11 @@ init)
    mkdir -p $INSTANCE_HOME
    rm $INSTANCE_HOME/mkebsboot.sh 2>&-
    echo '#!/bin/bash'>>$INSTANCE_HOME/mkebsboot.sh
-   echo 'set -u'>>$INSTANCE_HOME/mkebsboot.sh
+   echo 'set +u'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'shopt -s xpg_echo'>>$INSTANCE_HOME/mkebsboot.sh
    echo 'shopt -s expand_aliases'>>$INSTANCE_HOME/mkebsboot.sh
    echo "PROMPT_COMMAND='echo -ne \"\033]0;mkebsboot\007\"'">>$INSTANCE_HOME/mkebsboot.sh
+   echo 'export PATH=/usr/ucb/bin:/bin:/sbin:/usr/bin:/usr/sbin'>>$INSTANCE_HOME/mkebsboot.sh
    echo "export INSTANCE_NAME='mkebsboot'">>$INSTANCE_HOME/mkebsboot.sh
    echo "export TMP_DIR='$TMP_DIR'">>$INSTANCE_HOME/mkebsboot.sh
    echo "export INSTANCE_NAME='$INSTANCE_NAME'">>$INSTANCE_HOME/mkebsboot.sh
diff --git a/scriptbuilder/src/test/resources/test_runrun.cmd b/scriptbuilder/src/test/resources/test_runrun.cmd
index e5ee44bfff..e0bad8b8c4 100644
Binary files a/scriptbuilder/src/test/resources/test_runrun.cmd and b/scriptbuilder/src/test/resources/test_runrun.cmd differ
diff --git a/scriptbuilder/src/test/resources/test_runrun.sh b/scriptbuilder/src/test/resources/test_runrun.sh
index 85f6d11fb9..af4a9a588f 100644
--- a/scriptbuilder/src/test/resources/test_runrun.sh
+++ b/scriptbuilder/src/test/resources/test_runrun.sh
@@ -5,6 +5,7 @@ echo 'set +u'>>/tmp/$USER/scripttest/yahooprod.sh
 echo 'shopt -s xpg_echo'>>/tmp/$USER/scripttest/yahooprod.sh
 echo 'shopt -s expand_aliases'>>/tmp/$USER/scripttest/yahooprod.sh
 echo "PROMPT_COMMAND='echo -ne \"\033]0;yahooprod\007\"'">>/tmp/$USER/scripttest/yahooprod.sh
+echo 'export PATH=/usr/ucb/bin:/bin:/sbin:/usr/bin:/usr/sbin'>>/tmp/$USER/scripttest/yahooprod.sh
 echo "export INSTANCE_NAME='yahooprod'">>/tmp/$USER/scripttest/yahooprod.sh
 echo "export JAVA_HOME='$JAVA_HOME'">>/tmp/$USER/scripttest/yahooprod.sh
 echo 'cd /tmp/$USER/scripttest'>>/tmp/$USER/scripttest/yahooprod.sh
diff --git a/scriptbuilder/src/test/resources/test_script.sh b/scriptbuilder/src/test/resources/test_script.sh
index 16ee904236..a7531c352a 100644
--- a/scriptbuilder/src/test/resources/test_script.sh
+++ b/scriptbuilder/src/test/resources/test_script.sh
@@ -11,7 +11,7 @@ function default {
    export RUNTIME="Moo"
    return 0
 }
-export PATH=/usr/ucb/bin:/bin:/usr/bin:/usr/sbin
+export PATH=/usr/ucb/bin:/bin:/sbin:/usr/bin:/usr/sbin
 case $1 in
 start)
    default || exit 1
diff --git a/scriptbuilder/src/test/resources/test_seek_and_destroy.sh b/scriptbuilder/src/test/resources/test_seek_and_destroy.sh
index 0fc6e2f1af..ed83ca9ece 100644
--- a/scriptbuilder/src/test/resources/test_seek_and_destroy.sh
+++ b/scriptbuilder/src/test/resources/test_seek_and_destroy.sh
@@ -22,7 +22,7 @@ function findPid {
       return 1
    }
 }
-export PATH=/usr/ucb/bin:/bin:/usr/bin:/usr/sbin
+export PATH=/usr/ucb/bin:/bin:/sbin:/usr/bin:/usr/sbin
 findPid $@ || exit 1
 [ -n "$FOUND_PID" ]  && {
    echo stopping $FOUND_PID