diff --git a/ADL.csproj b/ADL.csproj
index 346677b..e9cb9cb 100755
--- a/ADL.csproj
+++ b/ADL.csproj
@@ -6,12 +6,14 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15DF3516-FE95-4BB0-9353-2E1E624303B8}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ADL</RootNamespace>
     <AssemblyName>ADL</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <StartupObject>
+    </StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/ADL.sln b/ADL.sln
index e7c433f..950d371 100755
--- a/ADL.sln
+++ b/ADL.sln
@@ -3,13 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ADL", "ADL.csproj", "{15DF3516-FE95-4BB0-9353-2E1E624303B8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "..\TestApp\TestApp.csproj", "{45578889-14A2-4A53-8391-0596369CCBA5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "..\UnitTests\UnitTests.csproj", "{D705F7CA-EB87-48EF-8F18-7D1AD90660BA}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CygnetToolkit", "..\CygnetToolkit\CygnetToolkit.csproj", "{77FB7DE5-1F33-4DDC-8A2E-79EF4728705E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.csproj", "{45578889-14A2-4A53-8391-0596369CCBA5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{535E325C-7823-497E-A990-E3331C64681F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{83B41EED-23C8-4DEF-B113-46A426346E45}"
+	ProjectSection(SolutionItems) = preProject
+		ADL.vsmdi = ADL.vsmdi
+		LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
+	EndProjectSection
+EndProject
 Global
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = ADL.vsmdi
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -19,18 +28,18 @@ Global
 		{15DF3516-FE95-4BB0-9353-2E1E624303B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15DF3516-FE95-4BB0-9353-2E1E624303B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15DF3516-FE95-4BB0-9353-2E1E624303B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45578889-14A2-4A53-8391-0596369CCBA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45578889-14A2-4A53-8391-0596369CCBA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45578889-14A2-4A53-8391-0596369CCBA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45578889-14A2-4A53-8391-0596369CCBA5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D705F7CA-EB87-48EF-8F18-7D1AD90660BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D705F7CA-EB87-48EF-8F18-7D1AD90660BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D705F7CA-EB87-48EF-8F18-7D1AD90660BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D705F7CA-EB87-48EF-8F18-7D1AD90660BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{77FB7DE5-1F33-4DDC-8A2E-79EF4728705E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{77FB7DE5-1F33-4DDC-8A2E-79EF4728705E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{77FB7DE5-1F33-4DDC-8A2E-79EF4728705E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{77FB7DE5-1F33-4DDC-8A2E-79EF4728705E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45578889-14A2-4A53-8391-0596369CCBA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45578889-14A2-4A53-8391-0596369CCBA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45578889-14A2-4A53-8391-0596369CCBA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45578889-14A2-4A53-8391-0596369CCBA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{535E325C-7823-497E-A990-E3331C64681F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{535E325C-7823-497E-A990-E3331C64681F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{535E325C-7823-497E-A990-E3331C64681F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{535E325C-7823-497E-A990-E3331C64681F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/TestApp/TestApp.csproj b/TestApp/TestApp.csproj
index 303fae2..7b6b2d2 100755
--- a/TestApp/TestApp.csproj
+++ b/TestApp/TestApp.csproj
@@ -33,6 +33,10 @@
     <Reference Include="Castle.Core, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />
     <Reference Include="Castle.MonoRail.Framework, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />
     <Reference Include="Castle.MonoRail.Framework.Views.NVelocity, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" />
+    <Reference Include="Iesi.Collections, Version=1.0.0.3, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>L:\Castle\1.0.3RC3\Iesi.Collections.dll</HintPath>
+    </Reference>
     <Reference Include="NHibernate, Version=1.2.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -83,6 +87,12 @@
     <None Include="Web\Views\Auto\test\person\edit.auto.vm" />
     <None Include="Web\Views\Auto\test\person\maybedelete.auto.vm" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\CygnetToolkit\CygnetToolkit.csproj">
+      <Project>{77FB7DE5-1F33-4DDC-8A2E-79EF4728705E}</Project>
+      <Name>CygnetToolkit</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="Web\bin\" />
diff --git a/TestApp/Web/Views/Auto/test/1 b/TestApp/Web/Views/Auto/test/1
index 8367f9d..0aa8241 100755
--- a/TestApp/Web/Views/Auto/test/1
+++ b/TestApp/Web/Views/Auto/test/1
@@ -10,8 +10,8 @@
 	Copyright (c) 2008 Cygnet Solutions Ltd
 	
 	$Author: sb $
-	$Revision: 1.2 $
-	$Date: 2008-06-19 09:04:01 $
+	$Revision: 1.3 $
+	$Date: 2008-07-01 16:08:18 $
 -->
 <output xmlns="http://cygnets.co.uk/schemas/adl-1.2" xmlns:adl="http://cygnets.co.uk/schemas/adl-1.2" xmlns:msxsl="urn:schemas-microsoft-com:xslt">
   <!--Layout is default-->
diff --git a/TestApp/testapp.adl.xml b/TestApp/testapp.adl.xml
index 6d864df..d05b3ec 100755
--- a/TestApp/testapp.adl.xml
+++ b/TestApp/testapp.adl.xml
@@ -12,11 +12,11 @@
 	Copyright (c) 2008 Cygnet Solutions Ltd
 	
 	$Author: sb $
-	$Revision: 1.1 $
-	$Date: 2008-06-18 15:55:49 $
+	$Revision: 1.2 $
+	$Date: 2008-07-01 16:08:17 $
 -->
 
-<application name="adltestapp" xmlns="http://cygnets.co.uk/schemas/adl-1.2">
+<application name="ADLTestApp" xmlns="http://cygnets.co.uk/schemas/adl-1.2">
 	<content>
 		<head>
 			
@@ -42,14 +42,14 @@
 	</typedef>
 	<group name="public"/>
 	<group name="admin" parent="public"/>
-	<entity name="person">
+	<entity name="Person">
 		<property name="LastName" type="string" required="true" size="100" distinct="user">
 			<prompt locale="en-UK" prompt="Surname"/>
 		</property>
 		<property name="ForeNames" type="string" required="true" size="100" distinct="user">
 			<prompt locale="en-UK" prompt="Fore names"/>
 		</property>
-		<property name="Partner" type="entity" entity="person"/>
+		<property name="Partner" type="entity" entity="Person"/>
 		<property name="Gender" type="string" size="1" required="true">
 			<option value="M">
 				<prompt locale="en-GB" prompt="Male"/>
@@ -59,8 +59,8 @@
 			</option> 
 		</property>
 		<property name="age" type="defined" typedef="age"/>
-		<property name="Address" type="entity" entity="address" distinct="user"/> 
-		<property name="Friends" type="link" entity="person"/>
+		<property name="Address" type="entity" entity="Address" distinct="user"/> 
+		<property name="Friends" type="link" entity="Person"/>
 		<form name="edit" properties="listed">
 			<fieldgroup name="Personal Data">
 				<documentation>
@@ -84,7 +84,7 @@
 			</fieldgroup>
 		</form>
 	</entity>
-	<entity name="address">
+	<entity name="Address">
 		<key>
 			<property name="Number" type="string" size="8" distinct="all">
 				<prompt locale="en-GB" prompt="House number"/>
diff --git a/test.build b/test.build
index 34cf7a3..4611d9a 100755
--- a/test.build
+++ b/test.build
@@ -3,7 +3,7 @@
          xmlns="http://nant.sf.net/release/0.85-rc4/nant.xsd"
          xmlns:nant="http://nant.sf.net/release/0.85-rc4/nant.xsd"
          >
-	<property name="build.revision" value="$Revision: 1.4 $"/>
+	<property name="build.revision" value="$Revision: 1.5 $"/>
 
 	<property name="adl" value="."/>
 	<property name="adl-transforms" value="${adl}/transforms"/>
@@ -22,10 +22,10 @@
 
 	<property name="adl-src" value="${testapp}/testapp.adl.xml" />
 	<property name="canonical" value="${tmpdir}/testapp.adl.xml" />
-
 	<property name="area-name" value="test"/>
-
 	<property name="nant-tasks" value="${tmpdir}/NantTasks.dll"/>
+	<property name="nant-contrib-dll" value="C:\Program Files\nantcontrib-0.85\bin\NAnt.Contrib.Tasks.dll"/>
+
 
 	<target name="fetchtasks" depends="prepare"
 		  description="fetches our NantTaks library from the well known place where it resides">
@@ -43,6 +43,11 @@
 		</style>
 	</target>
 
+	<target name="analyse">
+		<loadtasks assembly="${nant-contrib-dll}" />
+		<fxcop directOutputToConsole="true" projectFile="${testapp}/TestApp.fxcop">
+		</fxcop>
+	</target>
 
 	<target name="hbm" description="generates adl for testapp database NHibernate mapping"
 			depends="canonicalise">