diff --git a/source/test-resources/xforms/tests/bugs/ETHREEOH-950.xsd b/source/test-resources/xforms/tests/bugs/ETHREEOH-950.xsd
deleted file mode 100644
index a5f29362ad..0000000000
--- a/source/test-resources/xforms/tests/bugs/ETHREEOH-950.xsd
+++ /dev/null
@@ -1,116 +0,0 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:pr="http://www.discoverlosangeles.com/content"
-           xmlns:alf="http://www.alfresco.org"
-           targetNamespace="http://www.discoverlosangeles.com/content"
-           elementFormDefault="qualified">
-
-    <xs:include schemaLocation="http://ec2-67-202-37-136.compute-1.amazonaws.com/tools/currentDate.jsp"/>
-
-    <xs:element name="content_article">
-        <xs:complexType>
-
-            <xs:sequence>
-                
-                <xs:element name="title" type="xs:normalizedString" minOccurs="1" maxOccurs="1"/>
-                
-                <xs:element name="sub_title_or_meta_description" minOccurs="1" maxOccurs="1">
-                    <xs:simpleType>
-                        <xs:restriction base="xs:normalizedString">
-                            <xs:maxLength value="160"/>
-                        </xs:restriction>
-                    </xs:simpleType>
-                </xs:element>
-                <xs:element name="meta_keywords" type="xs:normalizedString" minOccurs="0" maxOccurs="1"/>
-
-                <xs:element name="headline_image">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="image" type="xs:anyURI" minOccurs="0" maxOccurs="1">
-                                <xs:annotation>
-                                    <xs:appinfo>
-                                        <alf:label>Image path</alf:label>
-                                        <alf:alert>An image is required to create content</alf:alert>
-                                        <alf:appearance>image_file_picker</alf:appearance>
-                                    </xs:appinfo>
-                                </xs:annotation>
-                            </xs:element>
-                            <xs:element name="caption" type="xs:normalizedString" minOccurs="0" maxOccurs="1"/>
-                            <xs:element name="credits" type="xs:normalizedString" minOccurs="0" maxOccurs="1"/>
-
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-
-                <xs:element name="paragraph" minOccurs="1" maxOccurs="unbounded">
-                    <xs:complexType>
-					<xs:sequence>
-                    <xs:element name="heading" type="xs:normalizedString" minOccurs="1" maxOccurs="1"/>
-                    <xs:element name="content" type="xs:string" minOccurs="1" maxOccurs="1">
-                        <xs:annotation>
-                            <xs:appinfo>
-                                <alf:appearance>full</alf:appearance>
-                            </xs:appinfo>
-                        </xs:annotation>
-
-                    </xs:element>
-                    <xs:element name="photo" minOccurs="0"
-                                maxOccurs="1">
-                        <xs:complexType>
-                            <xs:sequence>
-                                <xs:element name="image" type="xs:anyURI" minOccurs="0" maxOccurs="1">
-                                <xs:annotation>
-                                    <xs:appinfo>
-                                        <alf:label>Image path</alf:label>
-                                        <alf:alert>An image is required to create content</alf:alert>
-                                        <alf:appearance>image_file_picker</alf:appearance>
-                                    </xs:appinfo>
-                                </xs:annotation>
-                            </xs:element>
-                                <xs:element name="caption" type="xs:normalizedString" minOccurs="0" maxOccurs="1"/>
-                                <xs:element name="credits" type="xs:normalizedString" minOccurs="0" maxOccurs="1"/>
-                            </xs:sequence>
-                        </xs:complexType>
-                    </xs:element>
-                    <xs:element name="google_map" minOccurs="0"
-                                maxOccurs="1">
-                        <xs:complexType>
-                            <xs:sequence>
-                            	<xs:element name="aptify_id" type="xs:normalizedString" minOccurs="0" maxOccurs="1"/>
-                                <xs:element name="address" type="xs:normalizedString" minOccurs="0" maxOccurs="1"/>
-                                <xs:element name="longitude" type="xs:normalizedString" minOccurs="0" maxOccurs="1"/>
-                                <xs:element name="latitude" type="xs:normalizedString" minOccurs="0" maxOccurs="1"/>
-                            </xs:sequence>
-                        </xs:complexType>
-                    </xs:element>
-                    </xs:sequence>
-                    </xs:complexType>
-
-                </xs:element>
-                
-                <xs:element name="launch_date" type="pr:current_date" minOccurs="0" maxOccurs="1"/>
-                <xs:element name="expiration_date" type="xs:date" minOccurs="0" maxOccurs="1" default="2100-01-01"/>
-                
-                <xs:element name="show_as_promoted_on_homepage" type="xs:boolean" default="false"/>
-                <xs:element name="show_on_homepage" type="xs:boolean" default="false"/>
-                
-                <xs:element name="show_as_promoted_on_section_homepage" type="xs:boolean" default="false"/>
-                <xs:element name="show_on_section_homepage" type="xs:boolean" default="false"/>
-
-                <xs:element name="promotional_components">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="contest" type="xs:boolean" default="true"/>
-                            <xs:element name="newsletter" type="xs:boolean" default="true"/>
-                            <xs:element name="video_or_photo" type="xs:boolean" default="true"/>
-                            <xs:element name="map" type="xs:boolean" default="true"/>
-                            <xs:element name="top_ten" type="xs:boolean" default="true"/>
-                            <xs:element name="business_newsletter" type="xs:boolean" default="true"/>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>
-
diff --git a/source/test-resources/xforms/tests/bugs/ETWOTWO-71.xsd b/source/test-resources/xforms/tests/bugs/ETWOTWO-71.xsd
deleted file mode 100644
index fb730b5284..0000000000
--- a/source/test-resources/xforms/tests/bugs/ETWOTWO-71.xsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema attributeFormDefault="unqualified" 
-	elementFormDefault="qualified" 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:alf="http://www.alfresco.org"
-	xmlns:mitaa="http://alum.mit.edu/"
-	targetNamespace="http://alum.mit.edu/">
-	<xs:element name="page">
-		<xs:complexType>
-		<xs:sequence>
-			<xs:element minOccurs="1" maxOccurs="1" name="content">
-				<xs:complexType>
-				<xs:sequence>
-				
-				<!-- Main Body Content -->
-				<xs:element minOccurs="1" maxOccurs="1" name="main_body_content">
-						<xs:complexType>
-						<xs:sequence>
-							<xs:element type="xs:anyURI" name="main_image"  default="/images/learn"/>
-							<xs:element type="xs:normalizedString" name="main_image_caption" />
-							<xs:element type="xs:normalizedString" name="main_image_alt_text" />
-							
-							<xs:element type="xs:normalizedString" name="headline" />
-							<xs:element type="xs:string" name="teaser_text">
-								<xs:annotation><xs:appinfo><alf:appearance>minimal</alf:appearance></xs:appinfo></xs:annotation>
-							</xs:element>
-							<xs:element type="xs:anyURI" name="read_more_URL" />
-
-							<!--Related Links -->
-							<xs:element minOccurs="0" maxOccurs="2" name="related_links">
-								<xs:complexType>
-								<xs:sequence>
-									<xs:element name="link_title" type="xs:normalizedString" minOccurs="1" maxOccurs="1"/>
-									<xs:element name="link_URL" type="xs:anyURI" minOccurs="1" maxOccurs="1" />
-								</xs:sequence>
-								</xs:complexType>
-							</xs:element>
-							
-						</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					
-					<!-- Featured Learning 1 -->
-					<xs:element minOccurs="1" maxOccurs="1" name="featured_learning_one">
-						<xs:complexType>
-						<xs:sequence>
-							<xs:element type="xs:anyURI" name="image"  default="/images/learn"/>
-							<xs:element type="xs:normalizedString" name="image_alt_text" />
-							<xs:element type="xs:normalizedString" name="link_text" />
-							<xs:element type="xs:anyURI" name="link_URL" />
-						</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					
-					<!-- Featured Learning 2 -->
-					<xs:element minOccurs="1" maxOccurs="1" name="featured_learning_two">
-						<xs:complexType>
-						<xs:sequence>
-							<xs:element type="xs:anyURI" name="image"  default="/images/learn"/>
-							<xs:element type="xs:normalizedString" name="image_alt_text" />
-							<xs:element type="xs:normalizedString" name="link_text" />
-							<xs:element type="xs:anyURI" name="link_URL" />
-						</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					
-					<!-- Featured Learning 3 -->
-					<xs:element minOccurs="1" maxOccurs="3" name="featured_learning_three">
-						<xs:complexType>
-						<xs:sequence>
-							<xs:element type="xs:anyURI" name="image"  default="/images/learn"/>
-							<xs:element type="xs:normalizedString" name="image_alt_text" />
-							<xs:element type="xs:normalizedString" name="link_text" />
-							<xs:element type="xs:anyURI" name="link_URL" />
-						</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					
-<!-- NOTE TO ALFRESCO ENGINEER: Notice that the module below behaves as expected, and allows a user to input a minimum of 0 modules and an unbounded maximum number of modules. -->					
-					<!--See Also Module -->
-					<xs:element minOccurs="0" maxOccurs="unbounded" name="see_also">
-						<xs:complexType>
-						<xs:sequence>
-							<xs:element name="link_title" type="xs:normalizedString" minOccurs="1" maxOccurs="1"/>
-							<xs:element name="link_URL" type="xs:anyURI" minOccurs="1" maxOccurs="1" />
-						</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					
-<!-- NOTE TO ALFRESCO ENGINEER: Also notice that when the maximum cardinality is set to 1 the alfresco forms processor requires the user to enter at least one instance of the module, and it is therefore no longer optional. -->
-					<!-- Discussion Network module -->
-					<xs:element minOccurs="0" maxOccurs="1" nillable="true" name="featured_discussion">
-						<xs:complexType>
-						<xs:sequence>
-							<xs:element name="discussion" type="xs:normalizedString" minOccurs="1" maxOccurs="1" nillable="true"/>
-							<xs:element name="discussion_URL" type="xs:anyURI" minOccurs="1" maxOccurs="1" nillable="true"/>
-						</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-					
-					<!-- Contextual Giving Module -->
-					<xs:element minOccurs="0" maxOccurs="1" nillable="true" name="contextual_giving">
-						<xs:complexType>
-						<xs:sequence>
-							<xs:element name="title" type="xs:normalizedString" minOccurs="1" maxOccurs="1" nillable="true"/>
-							<xs:element name="body_text" type="xs:string" minOccurs="1" maxOccurs="1" nillable="true">
-								<xs:annotation><xs:appinfo><alf:appearance>minimal</alf:appearance></xs:appinfo></xs:annotation>
-							</xs:element>
-							<xs:element name="giving_URL" type="xs:anyURI" minOccurs="1" maxOccurs="1" nillable="true"/>
-							<xs:element name="optional_image" type="xs:anyURI" minOccurs="0" maxOccurs="2" nillable="true" />
-						</xs:sequence>
-						</xs:complexType>
-					</xs:element>
-				
-				</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/source/test-resources/xforms/tests/bugs/ETWOTWO-932.xsd b/source/test-resources/xforms/tests/bugs/ETWOTWO-932.xsd
deleted file mode 100644
index ee6f515caf..0000000000
Binary files a/source/test-resources/xforms/tests/bugs/ETWOTWO-932.xsd and /dev/null differ