diff --git a/Data/BulkLoad/bulk_load.sql b/Data/BulkLoad/bulk_load.sql
index 0a62189..f82f1e3 100644
--- a/Data/BulkLoad/bulk_load.sql
+++ b/Data/BulkLoad/bulk_load.sql
@@ -27,6 +27,10 @@ BEGIN
     dbms_output.put_line('Run bulk_load: Unexpected parameter value of &&1 received');
   END IF;
 
+  update system_configuration
+     set value = 'WEBMIP - '||upper('&&1')||' - '||to_char(sysdate, 'DD-Mon-YYYY')
+   where parameter = 'SYSTEM_NAME';
+
 END;
 /
 exit
diff --git a/Data/Seed/comsg.ctl b/Data/Seed/comsg.ctl
index c49fd10..1b4dab8 100644
--- a/Data/Seed/comsg.ctl
+++ b/Data/Seed/comsg.ctl
@@ -105,7 +105,7 @@ PRTP_PK|Attempting to create a duplicate Party_Relationship_Types entry
 PRTP_RT_FK|Application Error: Attempting to violate foreign key constraint PRTP_RT_FK. Please report this error to Advantica.
 PRTP_RT_FROM_FK|Application Error: Attempting to violate foreign key constraint PRTP_RT_FROM_FK. Please report this error to Advantica.
 PRTY_MANU_MANU_REF_UK|Attempting to enter a duplicate value (defined by unique constraint PRTY_MANU_MANU_REF_UK).
-PRTY_MKTP_MKTP_REF_UK|Attempting to enter a duplicate value (defined by unique constraint PRTY_MKTP_MKTP_REF_UK).
+PRTY_MKTP_MKTP_REF_UK|This Market Participant Reference has already been assigned to another market participant
 PRTY_PK|Attempting to create a duplicate Parties entry
 PWD_PK|Attempting to create a duplicate Passwords entry
 PWD_PRTY_FK|Application Error: Attempting to violate foreign key constraint PWD_PRTY_FK. Please report this error to Advantica.
@@ -187,3 +187,9 @@ POCO_PK|Attempting to create a duplicate Postcodes entry
 POCO_POCO_UK|This postcode already exists.
 POCO_REGI_FK|Application Error: Attempting to violate foreign key constraint POCO_REGI_FK. Please report this error to Advantica.
 PRTY_ORG_NAME_UK|An organization with this name already exists.
+COSTS_AICO_MANDATORY_CK|Additional item is mandatory
+COSTS_MOCO_MANDATORY_CK|Module is mandatory
+COSTS_HOCO_MANDATORY_CK|Housing is mandatory
+COSTS_BACO_MANDATORY_CK|Base is mandatory
+COSTS_MECO_MANDATORY_CK|Meter is mandatory
+COSTS_LACO_MANDATORY_CK|Enquiry type and meter type are mandatory
diff --git a/InstallMIP.cmd b/InstallMIP.cmd
index e39a671..df3cc72 100644
--- a/InstallMIP.cmd
+++ b/InstallMIP.cmd
@@ -7,7 +7,7 @@ if "%4"=="" goto :usage
 if "%5"=="" goto :usage
 
 @echo Install Schema
-sqlplus /nolog @Schema\InstallMIP %1 %2 %3 %4 %5
+sqlplus /nolog @Schema\InstallMIP %1 %2 %3 %4 %5 %6
 
 @echo Install Seed
 cd Data\Seed
diff --git a/Schema/AssociateSchema.sql b/Schema/AssociateSchema.sql
new file mode 100644
index 0000000..2f6fe34
--- /dev/null
+++ b/Schema/AssociateSchema.sql
@@ -0,0 +1,59 @@
+SET VERIFY OFF
+DECLARE
+
+  l_test_load  BOOLEAN := upper('&&2') = 'TEST';
+  l_fat_load   BOOLEAN := upper('&&2') = 'FAT';
+  l_uat_load   BOOLEAN := upper('&&2') = 'UAT';
+  l_live_load  BOOLEAN := upper('&&2') = 'LIVE';
+  l_train_load BOOLEAN := upper('&&2') = 'TRAIN';
+  l_dev_load   BOOLEAN := upper(nvl('&&2'
+                                   ,'DEV')) = 'DEV';
+  l_sgid       NUMBER;
+  l_flow_id    NUMBER;
+  l_schema     VARCHAR2(80) DEFAULT upper('&&1');
+BEGIN
+
+  IF l_test_load THEN
+    l_flow_id := 102;
+  ELSIF l_fat_load THEN
+    l_flow_id := 200;
+  ELSIF l_dev_load THEN
+    l_flow_id := 155;
+  ELSIF l_uat_load THEN
+    l_flow_id := 400;
+  ELSIF l_train_load THEN
+    l_flow_id := 800;
+  END IF;
+
+  IF l_flow_id IS NOT NULL THEN
+  
+    BEGIN
+      SELECT wwv_flow.get_current_flow_sgid(l_flow_id)
+        INTO l_sgid
+        FROM dual;
+    
+      wwv_flow_api.set_security_group_id(l_sgid);
+      apex_application.g_flow_id := l_flow_id;
+    
+      INSERT INTO flows_030000.wwv_flow_company_schemas
+        (security_group_id
+        ,SCHEMA)
+      VALUES
+        (l_sgid
+        ,l_schema);
+    EXCEPTION
+      WHEN dup_val_on_index THEN
+        NULL;
+    END;
+  
+    UPDATE flows_030000.wwv_flows w
+       SET w.owner = l_schema
+     WHERE security_group_id = l_sgid;
+  
+  ELSE
+    dbms_output.put_line('Run associate_schema: Unexpected parameter value of &&2 received');
+  END IF;
+
+END;
+/
+
diff --git a/Schema/InstallMIP.sql b/Schema/InstallMIP.sql
index 3998745..d1b02e1 100644
--- a/Schema/InstallMIP.sql
+++ b/Schema/InstallMIP.sql
@@ -24,4 +24,7 @@ connect &3/&4@&5
 @@mipViews.sql
 @@mipLibraries.sql
 
+connect &1/&2@&5 as sysdba
+@@AssociateSchema.sql &3 &6
+
 exit
diff --git a/Schema/mip.con b/Schema/mip.con
index 40cbe53..075f185 100644
--- a/Schema/mip.con
+++ b/Schema/mip.con
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.con
 --
--- Generated for Oracle 10g on Tue Feb 26  13:19:31 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Feb 28  15:14:04 2008 by Server Generator 10.1.2.6.18
   
 PROMPT Creating Primary Key on 'SYSTEM_CONFIGURATION'
 ALTER TABLE SYSTEM_CONFIGURATION
@@ -114,7 +114,17 @@ ALTER TABLE METER_SIZE_CODES
 PROMPT Creating Primary Key on 'COSTS'
 ALTER TABLE COSTS
  ADD (CONSTRAINT COST_PK PRIMARY KEY 
-  (ID))
+  (ID)
+ USING INDEX 
+ INITRANS 2
+ MAXTRANS 255
+ PCTFREE 10
+ STORAGE
+ (
+   INITIAL 65536
+   MINEXTENTS 1
+   MAXEXTENTS UNLIMITED
+ ))
 /
 
 PROMPT Creating Primary Key on 'DOCUMENTS'
@@ -501,28 +511,59 @@ ALTER TABLE REGI_ENQU_EXCLUSIONS
                
 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1204031970_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_VALID_000 CHECK (VALID_FOR_EXISTING_METER IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'METER_SIZE_CODES'
 ALTER TABLE METER_SIZE_CODES
- ADD (CONSTRAINT AVCON_1204031970_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_VALID_001 CHECK (VALID_FOR_NEW_METER IN ('YES', 'NO')))
 /
  
 PROMPT Creating Check Constraint on 'COSTS'
 ALTER TABLE COSTS
- ADD (CONSTRAINT AVCON_1204031970_COST__000 CHECK (COST_TYPE 
+ ADD (CONSTRAINT COSTS_AICO_MANDATORY_CK CHECK (NOT (cost_type = 'AICO' AND ADIT_CODE IS NULL)))
+/
+
+PROMPT Creating Check Constraint on 'COSTS'
+ALTER TABLE COSTS
+ ADD (CONSTRAINT COSTS_MOCO_MANDATORY_CK CHECK (NOT (cost_type = 'MOCO' AND MODU_CODE IS NULL)))
+/
+
+PROMPT Creating Check Constraint on 'COSTS'
+ALTER TABLE COSTS
+ ADD (CONSTRAINT COSTS_HOCO_MANDATORY_CK CHECK (NOT (cost_type = 'HOCO' AND HOU_CODE IS NULL)))
+/
+
+PROMPT Creating Check Constraint on 'COSTS'
+ALTER TABLE COSTS
+ ADD (CONSTRAINT COSTS_BACO_MANDATORY_CK CHECK (NOT (cost_type = 'BACO' AND BAS_CODE IS NULL)))
+/
+
+PROMPT Creating Check Constraint on 'COSTS'
+ALTER TABLE COSTS
+ ADD (CONSTRAINT COSTS_LACO_MANDATORY_CK CHECK (NOT (cost_type = 'LACO' 
+AND ((ENTY_CODE is null ) OR (METY_CODE is NULL)))))
+/
+
+PROMPT Creating Check Constraint on 'COSTS'
+ALTER TABLE COSTS
+ ADD (CONSTRAINT COSTS_MECO_MANDATORY_CK CHECK (NOT (cost_type = 'MECO' AND METR_CODE IS NULL)))
+/
+
+PROMPT Creating Check Constraint on 'COSTS'
+ALTER TABLE COSTS
+ ADD (CONSTRAINT AVCON_1204211644_COST__000 CHECK (COST_TYPE 
 IN ('LACO', 'BACO', 'MOCO', 'MECO', 'AICO', 'HOCO', 'COST')))
 /
  
 PROMPT Creating Check Constraint on 'DOCUMENTS'
 ALTER TABLE DOCUMENTS
- ADD (CONSTRAINT AVCON_1204031970_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
+ ADD (CONSTRAINT AVCON_1204211644_DOCU__000 CHECK (DOCU_TYPE IN ('DOCU', 'INDO', 'EXDO', 'FIDO')))
 /
        
 PROMPT Creating Check Constraint on 'QUOTES'
 ALTER TABLE QUOTES
- ADD (CONSTRAINT AVCON_1204031970_QUTE__000 CHECK (QUTE_TYPE IN ('AQ', 'MQ', 'QUTE')))
+ ADD (CONSTRAINT AVCON_1204211644_QUTE__000 CHECK (QUTE_TYPE IN ('AQ', 'MQ', 'QUTE')))
 /
  
 PROMPT Creating Check Constraint on 'PARTY_RELATIONSHIPS'
@@ -534,17 +575,17 @@ to_parl_rt_code = to_prtp_rt_code))
      
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1204031970_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_TRIPA_000 CHECK (TRIPARTITE_MEMBER IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1204031970_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
+ ADD (CONSTRAINT AVCON_1204211644_STATU_000 CHECK (STATUS IN ('OPEN', 'EXPIRED', 'LOCKED')))
 /
 
 PROMPT Creating Check Constraint on 'PARTIES'
 ALTER TABLE PARTIES
- ADD (CONSTRAINT AVCON_1204031970_PRTY__000 CHECK (PRTY_TYPE 
+ ADD (CONSTRAINT AVCON_1204211644_PRTY__000 CHECK (PRTY_TYPE 
 IN ('PRTY', 'IO', 'EO', 'MKTP', 'PERS', 'MANU', 'NEMP', 'EMP', 'ORG'
 )))
 /
@@ -562,82 +603,82 @@ OR
 
 PROMPT Creating Check Constraint on 'DOCUMENT_ROLES'
 ALTER TABLE DOCUMENT_ROLES
- ADD (CONSTRAINT AVCON_1204031970_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
+ ADD (CONSTRAINT AVCON_1204211644_DORO__000 CHECK (DORO_TYPE IN ('DRRO', 'DORO', 'ENDO', 'QUDO')))
 /
  
 PROMPT Creating Check Constraint on 'QUOTE_ITEMS'
 ALTER TABLE QUOTE_ITEMS
- ADD (CONSTRAINT AVCON_1204031970_QUIT__000 CHECK (QUIT_TYPE IN ('LQI', 'AQI', 'BQI', 'MQI', 'QUIT', 'HQI')))
+ ADD (CONSTRAINT AVCON_1204211644_QUIT__000 CHECK (QUIT_TYPE IN ('LQI', 'AQI', 'BQI', 'MQI', 'QUIT', 'HQI')))
 /
  
 PROMPT Creating Check Constraint on 'ROLE_TYPES'
 ALTER TABLE ROLE_TYPES
- ADD (CONSTRAINT AVCON_1204031970_RT_TY_000 CHECK (RT_TYPE IN ('DORT', 'PART', 'RT', 'PCMRT', 'QURT', 'ENRT', 'PRT')))
+ ADD (CONSTRAINT AVCON_1204211644_RT_TY_000 CHECK (RT_TYPE IN ('DORT', 'PART', 'RT', 'PCMRT', 'QURT', 'ENRT', 'PRT')))
 /
             
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_DOWNS_000 CHECK (DOWNSTREAM_BOOSTER_OR_COMPRESS IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
+ ADD (CONSTRAINT AVCON_1204211644_INDIC_000 CHECK (INDICATIVE_TIME IN ('DY', 'AM', 'PM')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_HOUSI_000 CHECK (HOUSING_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_BASE__000 CHECK (BASE_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_CONVE_000 CHECK (CONVERTOR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_AMR_R_000 CHECK (AMR_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_EMS_R_000 CHECK (EMS_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_TWIN__000 CHECK (TWIN_STREAM_REQUIRED IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_EXIST_000 CHECK (EXISTING_LOGGER IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_EXIST_000 CHECK (EXISTING_LOGGER IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
+ ADD (CONSTRAINT AVCON_1204211644_LOAD__000 CHECK (LOAD_CONTROL_TYPE IN ('Constant', 'On/Off', 'Modulating')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_EXIST_001 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
+ ADD (CONSTRAINT AVCON_1204211644_EXIST_001 CHECK (EXISTING_METER_OWNER IN ('S', 'T', 'C')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_EXIST_002 CHECK (EXISTING_CONVERTOR IN ('YES', 'NO')))
+ ADD (CONSTRAINT AVCON_1204211644_EXIST_002 CHECK (EXISTING_CONVERTOR IN ('YES', 'NO')))
 /
 
 PROMPT Creating Check Constraint on 'ENQUIRIES'
 ALTER TABLE ENQUIRIES
- ADD (CONSTRAINT AVCON_1204031970_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
+ ADD (CONSTRAINT AVCON_1204211644_MARKE_000 CHECK (MARKET_SECTOR_CODE IN ('I', 'D')))
 /
           
 PROMPT Creating Check Constraint on 'REGI_ENQU_EXCLUSIONS'
diff --git a/Schema/mip.ind b/Schema/mip.ind
index 53f13bf..e4db6a6 100644
--- a/Schema/mip.ind
+++ b/Schema/mip.ind
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.ind
 --
--- Generated for Oracle 10g on Tue Feb 26  13:19:31 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Feb 28  15:14:04 2008 by Server Generator 10.1.2.6.18
   
 
 PROMPT Creating Index 'REGU_RETY_FK_I'
diff --git a/Schema/mip.sql b/Schema/mip.sql
index 09547db..52c8915 100644
--- a/Schema/mip.sql
+++ b/Schema/mip.sql
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sql
 --
--- Generated for Oracle 10g on Tue Feb 26  13:19:31 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Feb 28  15:14:05 2008 by Server Generator 10.1.2.6.18
 
 
 SPOOL mip.lst
diff --git a/Schema/mip.sqs b/Schema/mip.sqs
index 0573c7c..24d570e 100644
--- a/Schema/mip.sqs
+++ b/Schema/mip.sqs
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.sqs
 --
--- Generated for Oracle 10g on Tue Feb 26  13:19:31 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Feb 28  15:14:04 2008 by Server Generator 10.1.2.6.18
  
 PROMPT Creating Sequence 'FLTR_SEQ'
 CREATE SEQUENCE FLTR_SEQ
diff --git a/Schema/mip.tab b/Schema/mip.tab
index 2eaf711..0239b94 100644
--- a/Schema/mip.tab
+++ b/Schema/mip.tab
@@ -1,6 +1,6 @@
 -- C:\Andy\svn\WEBMIP\Schema\mip.tab
 --
--- Generated for Oracle 10g on Tue Feb 26  13:19:30 2008 by Server Generator 10.1.2.6.18
+-- Generated for Oracle 10g on Thu Feb 28  15:14:04 2008 by Server Generator 10.1.2.6.18
  
 
 
@@ -309,9 +309,9 @@ CREATE TABLE PARTIES
  ,UPDATED_ON DATE
  ,UPDATED_BY VARCHAR2(80)
  ,MKTP_REF VARCHAR2(80)
- ,LT_7B_CONTRACT_REF VARCHAR2(25)
- ,GT_7B_CONTRACT_REF VARCHAR2(25)
- ,ADVERSARIAL_CONTRACT_REF VARCHAR2(25)
+ ,LT_7B_CONTRACT_REF VARCHAR2(35)
+ ,GT_7B_CONTRACT_REF VARCHAR2(35)
+ ,ADVERSARIAL_CONTRACT_REF VARCHAR2(35)
  ,TRIPARTITE_MEMBER VARCHAR2(3)
  ,USERNAME VARCHAR2(80)
  ,STATUS VARCHAR2(7)
diff --git a/tests/constants.rb b/tests/constants.rb
index 9d0c425..21b936a 100644
--- a/tests/constants.rb
+++ b/tests/constants.rb
@@ -24,22 +24,23 @@ APPLICATIONID = '102'
 #
 # Default Screen urls
 #
+DEBUG=':::NO'
 START_URL = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':1::::::'
-LOGIN = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':101'
-EXPORT_DATA = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':5'
-ENQUIRY = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':32'
-BASE = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':50'
-HOUSING = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':54'
-MODULE = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':56'
+LOGIN = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':101'+DEBUG
+EXPORT_DATA = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':5'+DEBUG
+ENQUIRY = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':32'+DEBUG
+BASE = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':50'+DEBUG
+HOUSING = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':54'+DEBUG
+MODULE = PROTOCOL+MACHINE+'/'+DAD+'/f?p='+APPLICATIONID+':56'+DEBUG
 #URLs for party management screens
-MANAGE_PARTIES = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':60'
-CREATE_PARTY = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':61'
-ASSIGN_PARTY_ROLE = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':62'
-PARTY_CONTACT_DETAILS = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':63'
-PARTY_HOME_ADDR = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':64'
-EDIT_PARTIES = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':65'
-EDIT_PARTY = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':66'
-ADDON = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':23'
+MANAGE_PARTIES = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':60'+DEBUG
+CREATE_PARTY = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':61'+DEBUG
+ASSIGN_PARTY_ROLE = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':62'+DEBUG
+PARTY_CONTACT_DETAILS = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':63'+DEBUG
+PARTY_HOME_ADDR = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':64'+DEBUG
+EDIT_PARTIES = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':65'+DEBUG
+EDIT_PARTY = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':66'+DEBUG
+ADDON = PROTOCOL+MACHINE+'/'+DAD+'/f?p=' +APPLICATIONID+ ':23'+DEBUG
 
 #
 # Users required for the script
diff --git a/tests/start.rb b/tests/start.rb
index 6ed6ea9..6e4e091 100644
--- a/tests/start.rb
+++ b/tests/start.rb
@@ -36,10 +36,10 @@ include Watir
 #
 #Get our individual integration tests
 #
-#require 'exportdatatests'
+require 'exportdatatests'
 require 'enquirytests'
-#require 'housingtests'
-#require 'basestests'
-#require 'drawingtests.rb'
+require 'housingtests'
+require 'basestests'
+require 'drawingtests.rb'
 #@@ie.wait
 #@@ie.close
\ No newline at end of file