diff --git a/.hgignore b/.hgignore
index c11a796..2090ed3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1 +1,10 @@
 QtC-pvAccess.creator.user
+
+syntax: glob
+O.Common
+O.linux-x86
+
+syntax: regexp
+^bin
+^include
+
diff --git a/testApp/client/Makefile b/testApp/client/Makefile
index 45e18ee..12d5f58 100644
--- a/testApp/client/Makefile
+++ b/testApp/client/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configure/CONFIG
 
 PROD_HOST += testChannelAccessFactory
 testChannelAccessFactory_SRCS += testChannelAccessFactory.cpp
-testChannelAccessFactory_LIBS += pvAccess Com
+testChannelAccessFactory_LIBS += pvData pvAccess Com
 
 PROD_HOST += testMockClient
 testMockClient_SRCS = testMockClient.cpp MockClientImpl.cpp
diff --git a/testApp/utils/Makefile b/testApp/utils/Makefile
index e8b6525..e83fc7d 100644
--- a/testApp/utils/Makefile
+++ b/testApp/utils/Makefile
@@ -4,29 +4,27 @@ include $(TOP)/configure/CONFIG
 
 PROD_HOST += hexDumpTest
 hexDumpTest_SRCS += hexDumpTest.cpp
-hexDumpTest_LIBS += pvAccess
+hexDumpTest_LIBS += pvAccess pvData
 
 PROD_HOST += wildcharMatcherTest
 wildcharMatcherTest_SRCS += wildcharMatcherTest.cpp
-wildcharMatcherTest_LIBS += pvAccess Com
+wildcharMatcherTest_LIBS += pvAccess pvData Com
 
 PROD_HOST += arrayFIFOTest
 arrayFIFOTest_SRCS += arrayFIFOTest.cpp
-arrayFIFOTest_LIBS += pvAccess Com
+arrayFIFOTest_LIBS += pvAccess pvData Com
 
 PROD_HOST += growingCircularBufferTest
 growingCircularBufferTest_SRCS += growingCircularBufferTest.cpp
-growingCircularBufferTest_LIBS += pvAccess Com
+growingCircularBufferTest_LIBS += pvAccess pvData Com
 
 PROD_HOST += inetAddressUtilsTest
 inetAddressUtilsTest_SRCS += inetAddressUtilsTest.cpp
-inetAddressUtilsTest_LIBS += pvAccess Com pvData
-pvData_DIR = $(PVDATA_HOME)/lib/$(EPICS_HOST_ARCH)
+inetAddressUtilsTest_LIBS += pvAccess pvData Com
 
 PROD_HOST += loggerTest
 loggerTest_SRCS += loggerTest.cpp
-loggerTest_LIBS += pvAccess Com
-
+loggerTest_LIBS += pvAccess pvData Com
 
 include $(TOP)/configure/RULES
 #----------------------------------------