diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/inv_ent/TestBasic.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/inv_ent/TestBasic.java
index 7f740da..69a8cd3 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/inv_ent/TestBasic.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/inv_ent/TestBasic.java
@@ -66,7 +66,7 @@ import com.ning.billing.util.bus.BusService;
public class TestBasic {
private static final Logger log = LoggerFactory.getLogger(TestBasic.class);
- private static long AT_LEAST_ONE_MONTH_MS = (31 * 24 * 3600 * 1000);
+ private static long AT_LEAST_ONE_MONTH_MS = 31L * 24L * 3600L * 1000L;
@Inject IDBI dbi;
@@ -172,7 +172,7 @@ public class TestBasic {
@Test(groups = "fast", enabled = true)
public void testBasePlanComplete() throws Exception {
long DELAY = 5000;
-
+
Account account = accountUserApi.createAccount(getAccountData(), null, null);
assertNotNull(account);
diff --git a/beatrix/src/test/resources/resource.properties b/beatrix/src/test/resources/resource.properties
index 1cf5ad0..cc82754 100644
--- a/beatrix/src/test/resources/resource.properties
+++ b/beatrix/src/test/resources/resource.properties
@@ -1,4 +1,4 @@
-killbill.catalog.uri=file:beatrix/src/test/resources/catalogSample.xml
+killbill.catalog.uri=file:src/test/resources/catalogSample.xml
killbill.entitlement.dao.claim.time=60000
killbill.entitlement.dao.ready.max=1
killbill.entitlement.engine.notifications.sleep=500
