diff --git a/tools/ocft/Filesystem b/tools/ocft/Filesystem
index 47700a653..ec77a27be 100644
--- a/tools/ocft/Filesystem
+++ b/tools/ocft/Filesystem
@@ -1,110 +1,110 @@
 # Filesystem
 # by dejan@suse.de on 
 # Tue Feb 15 18:50:04 CET 2011
 
 CONFIG
 	Agent Filesystem
 	AgentRoot /usr/lib/ocf/resource.d/heartbeat
 	HangTimeout 20
 
 VARIABLE
 	OCFT_fs=/var/run/resource-agents/ocft-Filesystem-fs
-	OCFT_loop=/dev/loop0
+	OCFT_loop=/dev/loop7
 	OCFT_dir=/var/run/resource-agents/ocft-Filesystem-mnt
 
 SETUP-AGENT
 	losetup $OCFT_loop 2>/dev/null && exit 1
 	rmdir $OCFT_dir 2>/dev/null || true
 	mkdir $OCFT_dir
-	dd if=/dev/zero of=$OCFT_fs bs=1024k count=1 2>/dev/null
+	dd if=/dev/zero of=$OCFT_fs bs=1 count=0 seek=16M 2>/dev/null
 	mke2fs -Fq $OCFT_fs
 	losetup $OCFT_loop $OCFT_fs
 
 CLEANUP-AGENT
 	rmdir $OCFT_dir
 	rm $OCFT_fs
 	losetup -d $OCFT_loop
 
 CASE-BLOCK required_args
 	Env OCF_RESKEY_device=$OCFT_loop
 	Env OCF_RESKEY_fstype=ext2
 	Env OCF_RESKEY_directory=$OCFT_dir
 
 CASE-BLOCK default_status
 	AgentRun stop
 
 CASE-BLOCK prepare
 	Include required_args
 	Include default_status
 
 CASE "check base env"
 	Include prepare
 	AgentRun start OCF_SUCCESS
 
 CASE "check base env: invalid 'OCF_RESKEY_device'"
 	Include prepare
 	Env OCF_RESKEY_device=/dev/no_such_device
 	AgentRun start OCF_ERR_INSTALLED
 
 CASE "check base env: unset 'OCF_RESKEY_device'"
 	Include prepare
 	Unenv OCF_RESKEY_device
 	AgentRun start OCF_ERR_CONFIGURED
 
 CASE "normal start"
 	Include prepare
 	AgentRun start OCF_SUCCESS
 
 CASE "normal stop"
 	Include prepare
 	AgentRun start
 	AgentRun stop OCF_SUCCESS
 
 CASE "double start"
 	Include prepare
 	AgentRun start
 	AgentRun start OCF_SUCCESS
 
 CASE "double stop"
 	Include prepare
 	AgentRun stop OCF_SUCCESS
 
 CASE "monitor when running"
 	Include prepare
 	AgentRun start
 	AgentRun monitor OCF_SUCCESS
 
 CASE "monitor when not running"
 	Include prepare
 	AgentRun monitor OCF_NOT_RUNNING
 
 CASE "monitor depth 10 when running"
 	Include prepare
 	AgentRun start
 	Env OCF_CHECK_LEVEL=10
 	AgentRun monitor OCF_SUCCESS
 
 CASE "monitor depth 20 with running"
 	Include prepare
 	AgentRun start
 	Env OCF_CHECK_LEVEL=20
 	AgentRun monitor OCF_SUCCESS
 
 CASE "start insert failure (remove device)"
 	Include prepare
 	Bash losetup -d $OCFT_loop
 	BashAtExit losetup $OCFT_loop $OCFT_fs
 	AgentRun start OCF_ERR_GENERIC
 
 CASE "monitor depth 20 insert failure (r/o fs)"
 	Include prepare
 	AgentRun start
 	Bash mount -o remount,ro $OCFT_dir
 	BashAtExit mount -o remount,rw $OCFT_dir
 	Env OCF_CHECK_LEVEL=20
 	AgentRun monitor OCF_ERR_GENERIC
 
 CASE "unimplemented command"
 	Include prepare
 	AgentRun no_cmd OCF_ERR_UNIMPLEMENTED
 
diff --git a/tools/ocft/LVM b/tools/ocft/LVM
index f7154ae58..4bd2b221b 100644
--- a/tools/ocft/LVM
+++ b/tools/ocft/LVM
@@ -1,85 +1,86 @@
 # LVM
 # by dejan@suse.de on 
 # Wed Feb 16 13:15:01 CET 2011
 
 CONFIG
 	Agent LVM
 	AgentRoot /usr/lib/ocf/resource.d/heartbeat
 	HangTimeout 20
 
 VARIABLE
 	OCFT_pv=/var/run/resource-agents/ocft-LVM-pv
 	OCFT_vg=ocft-vg
 	OCFT_lv=ocft-lv
-	OCFT_loop=/dev/loop0
+	OCFT_loop=/dev/loop7
 
 SETUP-AGENT
-	losetup -d $OCFT_loop 2>/dev/null || true
-	dd if=/dev/zero of=$OCFT_pv bs=1024k count=1 2>/dev/null
+	losetup $OCFT_loop 2>/dev/null && exit 1
+	dd if=/dev/zero of=$OCFT_pv bs=1 count=0 seek=16M 2>/dev/null
 	losetup $OCFT_loop $OCFT_pv
 	pvcreate $OCFT_loop
 	vgcreate -s 4K $OCFT_vg $OCFT_loop
 	lvcreate -n $OCFT_lv -L 600K $OCFT_vg
 
 CLEANUP-AGENT
 	vgchange -an $OCFT_vg
 	lvremove -f /dev/$OCFT_vg/$OCFT_lv
 	vgremove -f $OCFT_vg
+	pvremove $OCFT_loop
 	losetup -d $OCFT_loop
 	rm $OCFT_pv
 
 CASE-BLOCK required_args
 	Env OCF_RESKEY_volgrpname=$OCFT_vg
 
 CASE-BLOCK default_status
 	AgentRun stop
 
 CASE-BLOCK prepare
 	Include required_args
 	Include default_status
 
 CASE "check base env"
 	Include prepare
 	AgentRun start OCF_SUCCESS
 
 CASE "check base env: invalid 'OCF_RESKEY_volgrpname'"
 	Include prepare
 	Env OCF_RESKEY_volgrpname=/dev/no_such_device
 	AgentRun start OCF_ERR_GENERIC
 
 CASE "check base env: unset 'OCF_RESKEY_volgrpname'"
 	Include prepare
 	Unenv OCF_RESKEY_volgrpname
 	AgentRun start OCF_ERR_CONFIGURED
 
 CASE "normal start"
 	Include prepare
 	AgentRun start OCF_SUCCESS
 
 CASE "normal stop"
 	Include prepare
 	AgentRun start
 	AgentRun stop OCF_SUCCESS
 
 CASE "double start"
 	Include prepare
 	AgentRun start
 	AgentRun start OCF_SUCCESS
 
 CASE "double stop"
 	Include prepare
 	AgentRun stop OCF_SUCCESS
 
 CASE "monitor when running"
 	Include prepare
 	AgentRun start
 	AgentRun monitor OCF_SUCCESS
 
 CASE "monitor when not running"
 	Include prepare
 	AgentRun monitor OCF_NOT_RUNNING
 
 CASE "unimplemented command"
 	Include prepare
 	AgentRun no_cmd OCF_ERR_UNIMPLEMENTED