diff --git a/wizard-server-test/pom.xml b/wizard-server-test/pom.xml
index 8c19a45..02b1327 100644
--- a/wizard-server-test/pom.xml
+++ b/wizard-server-test/pom.xml
@@ -35,12 +35,6 @@ This code is available under the Apache License, version 2: http://www.apache.or
0.6
-
- ru.yandex.qatools.embed
- postgresql-embedded
- 2.10
-
-
org.cobbzilla
restex
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/RandomUtil.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/RandomUtil.java
index 9dd856a..3356825 100644
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/RandomUtil.java
+++ b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/RandomUtil.java
@@ -1,7 +1,7 @@
package org.cobbzilla.wizardtest;
+import org.apache.commons.lang.math.RandomUtils;
import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.RandomUtils;
import java.util.List;
@@ -35,7 +35,7 @@ public class RandomUtil {
return now() + (days * 1000 * 60 * 60 * 24);
}
- public static boolean randomBoolean() { return RandomUtils.nextInt(0, 2) % 2 == 0; }
+ public static boolean randomBoolean() { return RandomUtils.nextInt(RANDOM, 2) == 0; }
public static T pickMod(T[] things, int i) {
if (i <= 0 || i > things.length) i = things.length;
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
index 54035a1..4ba0099 100644
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
+++ b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
@@ -22,7 +22,6 @@ import org.cobbzilla.wizard.server.config.RestServerConfiguration;
import org.junit.AfterClass;
import org.junit.Before;
import redis.embedded.RedisServer;
-import ru.yandex.qatools.embed.postgresql.EmbeddedPostgres;
import java.io.File;
import java.io.IOException;
@@ -38,13 +37,11 @@ import static java.lang.System.identityHashCode;
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
import static org.cobbzilla.util.daemon.ZillaRuntime.*;
import static org.cobbzilla.util.io.FileUtil.*;
-import static org.cobbzilla.util.network.NetworkUtil.IPv4_LOCALHOST;
import static org.cobbzilla.util.network.PortPicker.pickOrDie;
import static org.cobbzilla.util.reflect.ReflectionUtil.instantiate;
import static org.cobbzilla.util.system.CommandShell.execScript;
import static org.cobbzilla.wizard.model.entityconfig.ModelSetup.modelHash;
import static org.cobbzilla.wizard.model.entityconfig.ModelSetup.setupModel;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V11;
@Slf4j
public abstract class ApiModelTestBase>
@@ -83,10 +80,6 @@ public abstract class ApiModelTestBase server) {
if (enableEmbeddedRedis()) {
if (redisPort == null) {
@@ -99,23 +92,6 @@ public abstract class ApiModelTestBase