diff --git a/pom.xml b/pom.xml
index 5c57612..8892823 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <artifactId>events</artifactId>
   <name>events</name>
   <packaging>jar</packaging>
-  <version>2.11</version>
+  <version>2.12</version>
 
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/events/fsstore/FsStore.java b/src/main/java/com/googlesource/gerrit/plugins/events/fsstore/FsStore.java
index 57f3869..08b0a3b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/events/fsstore/FsStore.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/events/fsstore/FsStore.java
@@ -89,7 +89,7 @@
 
   @Inject
   public FsStore(SitePaths site) throws IOException {
-    this(site.data_dir.toPath().resolve("plugin").resolve("events").resolve("fstore-v2"));
+    this(site.data_dir.resolve("plugin").resolve("events").resolve("fstore-v2"));
   }
 
   public FsStore(Path base) throws IOException {
diff --git a/test/test_events_plugin.sh b/test/test_events_plugin.sh
index 465295e..75b2d34 100755
--- a/test/test_events_plugin.sh
+++ b/test/test_events_plugin.sh
@@ -225,20 +225,12 @@
 review "$ch1,1" --message "my_comment" $APPROVALS
 result_type "$GROUP" "$type"
 
-ch2=$(create_change "$REF_BRANCH" "$FILE_A") || exit
-review "$ch2,1" $APPROVALS
-
 type=change-merged
 capture_events 2
 submit "$ch1,1"
 result_type "$GROUP" "$type"
 result_type "$GROUP" "ref-updated" 2
 
-type=merge-failed
-capture_events
-submit "$ch2,1"
-result_type "$GROUP" "$type"
-
 # reviewer-added needs to be tested via Rest-API
 
 # ------------------------- Compare them all to Core -------------------------