killbill-aplcache

diff --git a/beatrix/src/test/resources/catalogSample.xml b/beatrix/src/test/resources/catalogSample.xml
index 7356d74..325f731 100644
--- a/beatrix/src/test/resources/catalogSample.xml
+++ b/beatrix/src/test/resources/catalogSample.xml
@@ -200,15 +200,16 @@ Use Cases to do:
 		<plan name="pistol-monthly">
 			<product>Pistol</product>
 			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>1</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<fixedPrice> <!-- empty price implies $0 -->
-					</fixedPrice>
-				</phase>
+                                <phase type="TRIAL">
+                                        <duration>
+                                                <unit>DAYS</unit>
+                                                <number>30</number>
+                                        </duration>
+                                        <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
+                                        <fixedPrice>
+                                        </fixedPrice>
+                                    <!-- no price implies $0 -->
+                                </phase>
 			</initialPhases>
 			<finalPhase type="EVERGREEN">
 				<duration>
@@ -227,15 +228,12 @@ Use Cases to do:
 			<initialPhases>
 				<phase type="TRIAL">
 					<duration>
-						<unit>MONTHS</unit>
-						<number>1</number>
+						<unit>DAYS</unit>
+						<number>30</number>
 					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-                        <price><currency>GBP</currency><value>29.95</value></price>
-                        <price><currency>EUR</currency><value>29.95</value></price>
-                        <price><currency>USD</currency><value>1.95</value></price>
-                    </recurringPrice>
+                                        <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
+                                        <fixedPrice>
+                                        </fixedPrice>
 				    <!-- no price implies $0 -->
 				</phase>
 			</initialPhases>
@@ -255,18 +253,16 @@ Use Cases to do:
 		<plan name="assault-rifle-monthly">
 			<product>Assault-Rifle</product>
 			<initialPhases>
-				<phase type="TRIAL">
-					<duration>
-						<unit>MONTHS</unit>
-						<number>1</number>
-					</duration>
-					<billingPeriod>MONTHLY</billingPeriod>
-					<recurringPrice>
-                        <price><currency>GBP</currency><value>29.95</value></price>
-                        <price><currency>EUR</currency><value>29.95</value></price>
-                        <price><currency>USD</currency><value>2.95</value></price>
-					</recurringPrice>
-				</phase>
+                                <phase type="TRIAL">
+                                        <duration>
+                                                <unit>DAYS</unit>
+                                                <number>30</number>
+                                        </duration>
+                                        <billingPeriod>NO_BILLING_PERIOD</billingPeriod>
+                                        <fixedPrice>
+                                        </fixedPrice>
+                                    <!-- no price implies $0 -->
+                                </phase>
 			</initialPhases>
 			<finalPhase type="EVERGREEN">
 				<duration>