diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeValueCreatorUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeValueCreatorUtil.java
deleted file mode 100644
index c0fd3ad8e5345..0000000000000
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateTimeValueCreatorUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2002-2018 "Neo4j,"
- * Neo4j Sweden AB [http://neo4j.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package org.neo4j.kernel.impl.index.schema;
-
-import org.neo4j.storageengine.api.schema.StoreIndexDescriptor;
-import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.ValueGroup;
-
-public class DateTimeValueCreatorUtil extends ValueCreatorUtil
-{
- DateTimeValueCreatorUtil( StoreIndexDescriptor schemaIndexDescriptor, double fractionDuplicates )
- {
- super( schemaIndexDescriptor, RandomValues.typesOfGroup( ValueGroup.ZONED_DATE_TIME ), fractionDuplicates );
- }
-}
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateValueCreatorUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateValueCreatorUtil.java
deleted file mode 100644
index 177f3757075ee..0000000000000
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DateValueCreatorUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2002-2018 "Neo4j,"
- * Neo4j Sweden AB [http://neo4j.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package org.neo4j.kernel.impl.index.schema;
-
-import org.neo4j.storageengine.api.schema.StoreIndexDescriptor;
-import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.ValueGroup;
-
-public class DateValueCreatorUtil extends ValueCreatorUtil
-{
- DateValueCreatorUtil( StoreIndexDescriptor indexDescriptor, double fractionDuplicates )
- {
- super( indexDescriptor, RandomValues.typesOfGroup( ValueGroup.DATE ), fractionDuplicates );
- }
-}
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationValueCreatorUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationValueCreatorUtil.java
deleted file mode 100644
index 44f04eb9cefec..0000000000000
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationValueCreatorUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2002-2018 "Neo4j,"
- * Neo4j Sweden AB [http://neo4j.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package org.neo4j.kernel.impl.index.schema;
-
-import org.neo4j.storageengine.api.schema.StoreIndexDescriptor;
-import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.ValueGroup;
-
-public class DurationValueCreatorUtil extends ValueCreatorUtil
-{
- DurationValueCreatorUtil( StoreIndexDescriptor schemaIndexDescriptor, double fractionDuplicates )
- {
- super( schemaIndexDescriptor, RandomValues.typesOfGroup( ValueGroup.DURATION ), fractionDuplicates );
- }
-}
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericValueCreatorUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericValueCreatorUtil.java
deleted file mode 100644
index d4e278911313b..0000000000000
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/GenericValueCreatorUtil.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2002-2018 "Neo4j,"
- * Neo4j Sweden AB [http://neo4j.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package org.neo4j.kernel.impl.index.schema;
-
-import org.neo4j.storageengine.api.schema.StoreIndexDescriptor;
-import org.neo4j.values.storable.RandomValues;
-
-class GenericValueCreatorUtil extends ValueCreatorUtil
-{
- GenericValueCreatorUtil( StoreIndexDescriptor indexDescriptor, double fractionDuplicates )
- {
- super( indexDescriptor, RandomValues.Type.values(), fractionDuplicates );
- }
-}
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeValueCreatorUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeValueCreatorUtil.java
deleted file mode 100644
index ad85a3466101c..0000000000000
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalDateTimeValueCreatorUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2002-2018 "Neo4j,"
- * Neo4j Sweden AB [http://neo4j.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package org.neo4j.kernel.impl.index.schema;
-
-import org.neo4j.storageengine.api.schema.StoreIndexDescriptor;
-import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.ValueGroup;
-
-public class LocalDateTimeValueCreatorUtil extends ValueCreatorUtil
-{
- LocalDateTimeValueCreatorUtil( StoreIndexDescriptor schemaIndexDescriptor, double fractionDuplicates )
- {
- super( schemaIndexDescriptor, RandomValues.typesOfGroup( ValueGroup.LOCAL_DATE_TIME ), fractionDuplicates );
- }
-}
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeValueCreatorUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeValueCreatorUtil.java
deleted file mode 100644
index 6a80fdf13fc3a..0000000000000
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/LocalTimeValueCreatorUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2002-2018 "Neo4j,"
- * Neo4j Sweden AB [http://neo4j.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package org.neo4j.kernel.impl.index.schema;
-
-import org.neo4j.storageengine.api.schema.StoreIndexDescriptor;
-import org.neo4j.values.storable.RandomValues;
-import org.neo4j.values.storable.ValueGroup;
-
-public class LocalTimeValueCreatorUtil extends ValueCreatorUtil
-{
- LocalTimeValueCreatorUtil( StoreIndexDescriptor indexDescriptor, double fractionDuplicates )
- {
- super( indexDescriptor, RandomValues.typesOfGroup( ValueGroup.LOCAL_TIME ), fractionDuplicates );
- }
-}
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessorTest.java
index 4c669e510cd9d..b9cf5a5d7c387 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessorTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessorTest.java
@@ -33,13 +33,16 @@
import org.neo4j.io.fs.FileSystemAbstraction;
import org.neo4j.io.pagecache.PageCache;
import org.neo4j.kernel.api.index.IndexProvider;
-import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.impl.index.schema.config.ConfiguredSpaceFillingCurveSettingsCache;
import org.neo4j.kernel.impl.index.schema.config.IndexSpecificSpaceFillingCurveSettingsCache;
import org.neo4j.storageengine.api.schema.StoreIndexDescriptor;
+import org.neo4j.values.storable.RandomValues;
import org.neo4j.values.storable.ValueGroup;
+import static org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory.forLabel;
+import static org.neo4j.kernel.impl.index.schema.ValueCreatorUtil.FRACTION_DUPLICATE_NON_UNIQUE;
+
@RunWith( Parameterized.class )
public class NativeIndexAccessorTest, VALUE extends NativeIndexValue> extends NativeIndexAccessorTests
{
@@ -49,52 +52,52 @@ public static Collection