killbill-memoizeit

diff --git a/osgi-bundles/bundles/analytics/pom.xml b/osgi-bundles/bundles/analytics/pom.xml
index 8c723e3..791be57 100644
--- a/osgi-bundles/bundles/analytics/pom.xml
+++ b/osgi-bundles/bundles/analytics/pom.xml
@@ -107,13 +107,18 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-mxj-db-files</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg
index 9d389dd..72e3833 100644
--- a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg
+++ b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg
@@ -921,8 +921,8 @@ insert into bip_fields (
 >>
 
 CHECK_TENANT_AND_ACCOUNT(prefix) ::= <<
-    <prefix>tenant_record_id <=> :tenantRecordId
-and <prefix>account_record_id <=> :accountRecordId
+    <prefix>tenant_record_id \<=\> :tenantRecordId
+and <prefix>account_record_id \<=\> :accountRecordId
 >>
 
 SELECT_STAR_FROM_TABLE(table) ::= <<

diff --git a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteWithEmbeddedDB.java b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteWithEmbeddedDB.java
index 17c6b79..9f867fe 100644
--- a/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteWithEmbeddedDB.java
+++ b/osgi-bundles/bundles/analytics/src/test/java/com/ning/billing/osgi/bundles/analytics/AnalyticsTestSuiteWithEmbeddedDB.java
@@ -29,7 +29,7 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 
-import com.ning.billing.commons.embeddeddb.h2.H2EmbeddedDB;
+import com.ning.billing.commons.embeddeddb.mysql.MySQLEmbeddedDB;
 import com.ning.billing.osgi.bundles.analytics.dao.BusinessAnalyticsSqlDao;
 import com.ning.billing.osgi.bundles.analytics.dao.BusinessDBIProvider;
 import com.ning.killbill.osgi.libs.killbill.OSGIKillbillDataSource;
@@ -41,13 +41,13 @@ import com.google.common.io.Resources;
 
 public abstract class AnalyticsTestSuiteWithEmbeddedDB extends AnalyticsTestSuiteNoDB {
 
-    protected H2EmbeddedDB embeddedDB;
+    protected MySQLEmbeddedDB embeddedDB;
     protected DBI dbi;
     protected BusinessAnalyticsSqlDao analyticsSqlDao;
 
     @BeforeClass(groups = "slow")
     public void setUpClass() throws Exception {
-        embeddedDB = new H2EmbeddedDB();
+        embeddedDB = new MySQLEmbeddedDB();
         embeddedDB.initialize();
         embeddedDB.start();
     }