diff --git a/tools/ocf-tester.in b/tools/ocf-tester.in
index 2d7400da0e..0eefb48a55 100644
--- a/tools/ocf-tester.in
+++ b/tools/ocf-tester.in
@@ -1,343 +1,343 @@
 #!/bin/sh
 #
 #	$Id: ocf-tester,v 1.2 2006/08/14 09:38:20 andrew Exp $
 #
 # Copyright (c) 2006 Novell Inc, Andrew Beekhof
 #                    All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
 LRMD=@libdir@/heartbeat/lrmd
 LRMADMIN=@libdir@/heartbeat/lrmadmin
 
 num_errors=0
 
 usage() {
     echo "ocf-tester [-Lh] -n resource_name [-o name=value]* /full/path/to/resource"
 	echo ""
 	echo "-L: use lrmadmin/lrmd for tests"
     exit $1
 }
 
 assert() {
     rc=$1; shift
     target=$1; shift
     msg=$1; shift
     exit_code=$1; shift
     if [ $rc -ne $target ]; then
 	num_errors=`expr $num_errors + 1`
 	echo -e "* rc=$rc: $msg"
 	if [ ! -z $exit_code ]; then
 	    echo "Aborting tests"
 	    exit $exit_code
 	fi
     fi
 }
 
 done=0
 ra_args=""
 verbose=0
 while test "$done" = "0"; do
     case "$1" in
 	-n) OCF_RESOURCE_INSTANCE=$2; ra_args="$ra_args OCF_RESOURCE_INSTANCE=$2"; shift; shift;;
 	-o) name=${2%%=*}; value=${2##*=}; 
 		lrm_ra_args="$lrm_ra_args $2";
 		ra_args="$ra_args OCF_RESKEY_$name=$value"; shift; shift;;
 	-L) use_lrmd=1; shift;;
 	-v) verbose=1; shift;;
 	-?) usage 0;;
 	-*) echo "unknown option: $1"; usage 1;;
 	*) done=1;;
     esac
 done
 
 if [ "x" = "x$OCF_ROOT" ]; then
     if [ -d /usr/lib/ocf ]; then
-	OCF_ROOT=/usr/lib/ocf
+	export OCF_ROOT=/usr/lib/ocf
     else
 	echo "You must supply the location of OCF_ROOT (common location is /usr/lib/ocf)"
 	usage 1
     fi
 fi
 
 if [ "x" = "x$OCF_RESOURCE_INSTANCE" ]; then
     echo "You must give your resource a name, set OCF_RESOURCE_INSTANCE"
     usage 1
 fi
 
 agent=$1
 if [ ! -e $agent ]; then
     echo "You must provide the full path to your resource agent"
     usage 1
 fi
 stopped_rc=7
 has_demote=1
 has_promote=1
 
 start_lrmd() {
 	lrmd_timeout=0
 	lrmd_interval=0
 	lrmd_target_rc=EVERYTIME
 	lrmd_started=""
 	$LRMD -s 2>/dev/null
 	rc=$?
 	if [ $rc -eq 3 ]; then
 		lrmd_started=1
 		$LRMD &
 		sleep 1
 		$LRMD -s 2>/dev/null
 	else
 		return $rc
 	fi
 }
 add_resource() {
 	$LRMADMIN -A $OCF_RESOURCE_INSTANCE \
 		ocf \
 		`basename $agent` \
 		$(basename `dirname $agent`) \
 		$lrm_ra_args > /dev/null
 }
 del_resource() {
 	$LRMADMIN -D $OCF_RESOURCE_INSTANCE
 }
 parse_lrmadmin_output() {
 	awk '
 BEGIN{ rc=1; }
 /Waiting for lrmd to callback.../ { n=1; next; }
 n==1 && /----------------operation--------------/ { n++; next; }
 n==2 && /return code:/ { rc=$0; sub("return code: *","",rc); next }
 n==2 && /---------------------------------------/ {
         n++;
         next;
 }
 END{
 	if( n!=3 ) exit 1;
 	else exit rc;
 }
 '
 }
 exec_resource() {
 	op="$1"
 	args="$2"
 	$LRMADMIN -E $OCF_RESOURCE_INSTANCE \
 		$op $lrmd_timeout $lrmd_interval \
 		$lrmd_target_rc \
 		$args | parse_lrmadmin_output
 }
 
 if [ "$use_lrmd" = 1 ]; then
 	echo "Using lrmd/lrmadmin for all tests"
 	start_lrmd || {
 		echo "could not start lrmd"
 		exit 1
 	}
 	trap '
 		[ "$lrmd_started" = 1 ] && $LRMD -k
 	' EXIT
 	add_resource || {
 		echo "failed to add resource to lrmd"
 		exit 1
 	}
 fi
 
 lrm_test_command() {
 	action="$1"
 	msg="$2"
 	[ "$verbose" -eq 0 ] || echo "$msg"
 	exec_resource $action "$lrm_ra_args"
 }
 
 test_command() {
     action=$1; shift
     msg=${1:-"Testing: $action"}
     if [ "$use_lrmd" = 1 ]; then
     	lrm_test_command $action "$msg"
     	return $?
     fi
     #echo Running: "export $ra_args; bash $agent $action 2>&1 > /dev/null"
     export $ra_args; 
     if [ $verbose -eq 0 ]; then
 	bash $agent $action >/dev/null 2>&1
     else
     	echo $msg
 	bash $agent $action
     fi
     rc=$?
     #echo rc: $rc
     return $rc
 }
 
 # Begin tests
 echo Beginning tests for $agent...
 
 if [ ! -f $agent ]; then
     assert 7 0 "Could not find file: $agent"
 fi
 
 test_command meta-data
 rc=$?
 if [ $rc -eq 3 ]; then
     assert $rc 0 "Your agent does not support the meta-data action"
 else
     assert $rc 0 "The meta-data action cannot fail and must return 0"
 fi
 
 test_command validate-all
 rc=$?
 if [ $rc -eq 3 ]; then
     assert $rc 0 "Your agent does not support the validate-all action"
 elif [ $rc -ne 0 ]; then
     assert $rc 0 "Validation failed.  Did you supply enough options with -o ?" 1
     usage $rc
 fi
 
 test_command monitor "Checking current state"
 rc=$?
 if [ $rc -eq 3 ]; then
     assert $rc 7 "Your agent does not support the monitor action" 1
 
 elif [ $rc -eq 1 ]; then
     assert $rc 7 "Monitoring a stopped resources should return 0"
     echo "Test updated to expect 1 for stopped resources for the remainder of this run"
     stopped_rc=1
 
 elif [ $rc -eq 8 ]; then
     test_command demote "Cleanup, demote"
     assert $? 0 "Your agent was a master and could not be demoted" 1
 
     test_command stop "Cleanup, stop"
     assert $? 0 "Your agent was a master and could not be stopped" 1
 
 elif [ $rc -ne 7 ]; then
     test_command stop
     assert $? 0 "Your agent was active and could not be stopped" 1
 fi
 
 test_command monitor
 assert $? $stopped_rc "Monitoring a stopped resource should return $stopped_rc"
 
 test_command start
 assert $? 0 "Start failed.  Did you supply enough options with -o ?" 1
 
 test_command monitor
 assert $? 0 "Monitoring an active resource should return 0"
 
 test_command notify
 rc=$?
 if [ $rc -eq 3 ]; then
     echo "* Your agent does not support the notify action (optional)"
 else
     assert $rc 0 "The notify action cannot fail and must return 0"
 fi
 
 test_command demote "Checking for demote action"
 if [ $? -eq 3 ]; then
     has_demote=0
     echo "* Your agent does not support the demote action (optional)"
 fi
 
 test_command promote "Checking for promote action"
 if [ $? -eq 3 ]; then
     has_promote=0
     echo "* Your agent does not support the promote action (optional)"
 fi
 
 if [ $has_promote -eq 1 -a $has_demote -eq 1 ]; then
     test_command demote "Testing: demotion of started resource"
     assert $? 0 "Demoting a start resource should not fail"
 
     test_command promote
     assert $? 0 "Promote failed"
 
     test_command demote
     assert $? 0 "Demote failed" 1
 
     test_command demote "Testing: demotion of demoted resource"
     assert $? 0 "Demoting a demoted resource should not fail"
 
     test_command promote "Promoting resource"
     assert $? 0 "Promote failed" 1
 
     test_command promote "Testing: promotion of promoted resource"
     assert $? 0 "Promoting a promoted resource should not fail"
 
     test_command demote "Demoting resource"
     assert $? 0 "Demote failed" 1
 
 elif [ $has_promote -eq 0 -a $has_demote -eq 0 ]; then
     echo "* Your agent does not support master/slave (optional)"
 
 else
     echo "* Your agent partially supports master/slave"
     num_errors=`expr $num_errors + 1`
 fi
 
 test_command stop
 assert $? 0 "Stop failed" 1
 
 test_command monitor
 assert $? $stopped_rc "Monitoring a stopped resource should return $stopped_rc"
 
 test_command start "Restarting resource..."
 assert $? 0 "Start failed" 1
 
 test_command monitor
 assert $? 0 "Monitoring an active resource should return 0"
 
 test_command start "Testing: starting a started resource"
 assert $? 0 "Starting a running resource is required to succeed"
 
 test_command monitor
 assert $? 0 "Monitoring an active resource should return 0"
 
 test_command stop "Stopping resource"
 assert $? 0 "Stop could not clean up after multiple starts" 1
 
 test_command monitor
 assert $? $stopped_rc "Monitoring a stopped resource should return $stopped_rc"
 
 test_command stop "Testing: stopping a stopped resource"
 assert $? 0 "Stopping a stopped resource is required to succeed"
 
 test_command monitor
 assert $? $stopped_rc "Monitoring a stopped resource should return $stopped_rc"
 
 test_command migrate_to "Checking for migrate_to action"
 rc=$?
 if [ $rc -ne 3 ]; then
     test_command migrate_from "Checking for migrate_from action"
 fi
 if [ $? -eq 3 ]; then
     echo "* Your agent does not support the migrate action (optional)"
 fi
 
 test_command reload "Checking for reload action"
 if [ $? -eq 3 ]; then
     echo "* Your agent does not support the reload action (optional)"
 fi
 
 if [ $num_errors -gt 0 ]; then
     echo Tests failed: $agent failed $num_errors tests
     exit 1
 else 
     echo $agent passed all tests
     exit 0
 fi