diff --git a/.travis.yml b/.travis.yml
index aacb38f..2bc63ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,3 @@ language: java
 sudo: false # faster builds
 jdk:
   - oraclejdk8
-
-before_install:
-  - pip install --user codecov
-
-after_success:
-  - codecov
diff --git a/README.md b/README.md
index 75f2b28..bd6cb40 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,10 @@ Be aware though that this doesn't necessarily applies for SNAPSHOT builds and th
 #### Master
 [![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=master)](https://travis-ci.org/Dissem/Jabit) 
 [![Code Quality](https://img.shields.io/codacy/e9938d2adbb74a0db553115bef692ff3/master.svg)](https://www.codacy.com/app/chrigu-meyer/Jabit/dashboard?bid=3144281)
-[![Test Coverage](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=master)](https://codecov.io/github/Dissem/Jabit?branch=master)
 
 #### Develop
 [![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=develop)](https://travis-ci.org/Dissem/Jabit?branch=develop) 
 [![Code Quality](https://img.shields.io/codacy/e9938d2adbb74a0db553115bef692ff3/develop.svg)](https://www.codacy.com/app/chrigu-meyer/Jabit/dashboard?bid=3144279)
-[![Test Coverage](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=develop)](https://codecov.io/github/Dissem/Jabit?branch=develop)
 
 Upgrading
 ---------
diff --git a/build.gradle b/build.gradle
index df0b9d4..cc9928c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,6 @@ subprojects {
     apply plugin: 'kotlin'
     apply plugin: 'maven'
     apply plugin: 'signing'
-    apply plugin: 'jacoco'
     apply plugin: 'gitflow-version'
     apply plugin: 'io.spring.dependency-management'
     apply plugin: 'com.github.ben-manes.versions'
@@ -117,15 +116,6 @@ subprojects {
         }
     }
 
-    jacocoTestReport {
-        reports {
-            xml.enabled = true
-            html.enabled = true
-        }
-    }
-
-    check.dependsOn jacocoTestReport
-
     dependencyManagement {
         dependencies {
             dependencySet(group: 'org.jetbrains.kotlin', version: "$kotlin_version") {
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
deleted file mode 100644
index d915215..0000000
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * Copyright 2015 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage.demo;
-
-import ch.dissem.bitmessage.BitmessageContext;
-import ch.dissem.bitmessage.entity.BitmessageAddress;
-import ch.dissem.bitmessage.entity.Plaintext;
-import ch.dissem.bitmessage.entity.payload.Pubkey;
-import ch.dissem.bitmessage.entity.valueobject.Label;
-import ch.dissem.bitmessage.entity.valueobject.extended.Message;
-import org.apache.commons.lang3.text.WordUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.InetAddress;
-import java.util.List;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import static ch.dissem.bitmessage.demo.CommandLine.COMMAND_BACK;
-import static ch.dissem.bitmessage.demo.CommandLine.ERROR_UNKNOWN_COMMAND;
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
-
-/**
- * A simple command line Bitmessage application
- */
-public class Application {
-    private final static Logger LOG = LoggerFactory.getLogger(Application.class);
-    private final static Pattern RESPONSE_PATTERN = Pattern.compile("^RE:.*$", CASE_INSENSITIVE);
-    private final CommandLine commandLine;
-
-    private BitmessageContext ctx;
-
-    public Application(BitmessageContext.Builder ctxBuilder, InetAddress syncServer, int syncPort) {
-        ctx = ctxBuilder
-            .listener(plaintext -> System.out.println("New Message from " + plaintext.getFrom() + ": " + plaintext.getSubject()))
-            .build();
-
-        if (syncServer == null) {
-            ctx.startup();
-        }
-
-        commandLine = new CommandLine();
-
-        String command;
-        do {
-            System.out.println();
-            System.out.println("available commands:");
-            System.out.println("i) identities");
-            System.out.println("c) contacts");
-            System.out.println("s) subscriptions");
-            System.out.println("m) messages");
-            if (syncServer != null) {
-                System.out.println("y) sync");
-            }
-            System.out.println("?) info");
-            System.out.println("e) exit");
-
-            command = commandLine.nextCommand();
-            try {
-                switch (command) {
-                    case "i": {
-                        identities();
-                        break;
-                    }
-                    case "c":
-                        contacts();
-                        break;
-                    case "s":
-                        subscriptions();
-                        break;
-                    case "m":
-                        labels();
-                        break;
-                    case "?":
-                        info();
-                        break;
-                    case "e":
-                        break;
-                    case "y":
-                        if (syncServer != null) {
-                            ctx.synchronize(syncServer, syncPort, 120, true);
-                        }
-                        break;
-                    default:
-                        System.out.println(ERROR_UNKNOWN_COMMAND);
-                }
-            } catch (Exception e) {
-                LOG.debug(e.getMessage());
-            }
-        } while (!"e".equals(command));
-        LOG.info("Shutting down client");
-        ctx.cleanup();
-        ctx.shutdown();
-    }
-
-    private void info() {
-        String command;
-        do {
-            System.out.println();
-            System.out.println(ctx.status());
-            System.out.println();
-            System.out.println("c) cleanup inventory");
-            System.out.println("r) resend unacknowledged messages");
-            System.out.println(COMMAND_BACK);
-
-            command = commandLine.nextCommand();
-            switch (command) {
-                case "c":
-                    ctx.cleanup();
-                    break;
-                case "r":
-                    ctx.resendUnacknowledgedMessages();
-                    break;
-                case "b":
-                    return;
-            }
-        } while (!"b".equals(command));
-    }
-
-    private void identities() {
-        String command;
-        List<BitmessageAddress> identities = ctx.addresses().getIdentities();
-        do {
-            System.out.println();
-            commandLine.listAddresses(identities, "identities");
-            System.out.println("a) create identity");
-            System.out.println("c) join chan");
-            System.out.println(COMMAND_BACK);
-
-            command = commandLine.nextCommand();
-            switch (command) {
-                case "a":
-                    addIdentity();
-                    identities = ctx.addresses().getIdentities();
-                    break;
-                case "c":
-                    joinChan();
-                    identities = ctx.addresses().getIdentities();
-                    break;
-                case "b":
-                    return;
-                default:
-                    try {
-                        int index = Integer.parseInt(command) - 1;
-                        address(identities.get(index));
-                    } catch (NumberFormatException e) {
-                        System.out.println(ERROR_UNKNOWN_COMMAND);
-                    }
-            }
-        } while (!"b".equals(command));
-    }
-
-    private void addIdentity() {
-        System.out.println();
-        BitmessageAddress identity = ctx.createIdentity(commandLine.yesNo("would you like a shorter address? This will take some time to calculate."), Pubkey.Feature.DOES_ACK);
-        System.out.println("Please enter an alias for this identity, or an empty string for none");
-        String alias = commandLine.nextLineTrimmed();
-        if (alias.length() > 0) {
-            identity.setAlias(alias);
-        }
-        ctx.addresses().save(identity);
-    }
-
-    private void joinChan() {
-        System.out.println();
-        System.out.print("Passphrase: ");
-        String passphrase = commandLine.nextLine();
-        System.out.print("Address: ");
-        String address = commandLine.nextLineTrimmed();
-        ctx.joinChan(passphrase, address);
-    }
-
-    private void contacts() {
-        String command;
-        List<BitmessageAddress> contacts = ctx.addresses().getContacts();
-        do {
-            System.out.println();
-            commandLine.listAddresses(contacts, "contacts");
-            System.out.println();
-            System.out.println("a) add contact");
-            System.out.println(COMMAND_BACK);
-
-            command = commandLine.nextCommand();
-            switch (command) {
-                case "a":
-                    addContact(false);
-                    contacts = ctx.addresses().getContacts();
-                    break;
-                case "b":
-                    return;
-                default:
-                    try {
-                        int index = Integer.parseInt(command) - 1;
-                        address(contacts.get(index));
-                    } catch (NumberFormatException e) {
-                        System.out.println(ERROR_UNKNOWN_COMMAND);
-                    }
-            }
-        } while (!"b".equals(command));
-    }
-
-    private void addContact(boolean isSubscription) {
-        System.out.println();
-        System.out.println("Please enter the Bitmessage address you want to add");
-        try {
-            BitmessageAddress address = new BitmessageAddress(commandLine.nextLineTrimmed());
-            System.out.println("Please enter an alias for this address, or an empty string for none");
-            String alias = commandLine.nextLineTrimmed();
-            if (alias.length() > 0) {
-                address.setAlias(alias);
-            }
-            if (isSubscription) {
-                ctx.addSubscribtion(address);
-            }
-            ctx.addContact(address);
-        } catch (IllegalArgumentException e) {
-            System.out.println(e.getMessage());
-        }
-    }
-
-    private void subscriptions() {
-        String command;
-        List<BitmessageAddress> subscriptions = ctx.addresses().getSubscriptions();
-        do {
-            System.out.println();
-            commandLine.listAddresses(subscriptions, "subscriptions");
-            System.out.println();
-            System.out.println("a) add subscription");
-            System.out.println(COMMAND_BACK);
-
-            command = commandLine.nextCommand();
-            switch (command) {
-                case "a":
-                    addContact(true);
-                    subscriptions = ctx.addresses().getSubscriptions();
-                    break;
-                case "b":
-                    return;
-                default:
-                    try {
-                        int index = Integer.parseInt(command) - 1;
-                        address(subscriptions.get(index));
-                    } catch (NumberFormatException e) {
-                        System.out.println(ERROR_UNKNOWN_COMMAND);
-                    }
-            }
-        } while (!"b".equals(command));
-    }
-
-    private void address(BitmessageAddress address) {
-        System.out.println();
-        if (address.getAlias() != null)
-            System.out.println(address.getAlias());
-        System.out.println(address.getAddress());
-        System.out.println("Stream:  " + address.getStream());
-        System.out.println("Version: " + address.getVersion());
-        if (address.getPrivateKey() == null) {
-            if (address.getPubkey() == null) {
-                System.out.println("Public key still missing");
-            } else {
-                System.out.println("Public key available");
-            }
-        } else {
-            if (address.isChan()) {
-                System.out.println("Chan");
-            } else {
-                System.out.println("Identity");
-            }
-        }
-    }
-
-    private void labels() {
-        List<Label> labels = ctx.messages().getLabels();
-        String command;
-        do {
-            System.out.println();
-            int i = 0;
-            for (Label label : labels) {
-                i++;
-                System.out.print(i + ") " + label);
-                int unread = ctx.messages().countUnread(label);
-                if (unread > 0) {
-                    System.out.println(" [" + unread + "]");
-                } else {
-                    System.out.println();
-                }
-            }
-            System.out.println("a) Archive");
-            System.out.println();
-            System.out.println("c) compose message");
-            System.out.println("s) compose broadcast");
-            System.out.println(COMMAND_BACK);
-
-            command = commandLine.nextCommand();
-            switch (command) {
-                case "a":
-                    messages(null);
-                    break;
-                case "c":
-                    compose(false);
-                    break;
-                case "s":
-                    compose(true);
-                    break;
-                case "b":
-                    return;
-                default:
-                    try {
-                        int index = Integer.parseInt(command) - 1;
-                        messages(labels.get(index));
-                    } catch (NumberFormatException | IndexOutOfBoundsException e) {
-                        System.out.println(ERROR_UNKNOWN_COMMAND);
-                    }
-            }
-        } while (!"b".equalsIgnoreCase(command));
-    }
-
-    private void messages(Label label) {
-        String command;
-        do {
-            List<Plaintext> messages = ctx.messages().findMessages(label);
-            System.out.println();
-            int i = 0;
-            for (Plaintext message : messages) {
-                i++;
-                System.out.println(i + (message.isUnread() ? ">" : ")") + " From: " + message.getFrom() + "; Subject: " + message.getSubject());
-            }
-            if (i == 0) {
-                System.out.println("There are no messages.");
-            }
-            System.out.println();
-            System.out.println("c) compose message");
-            System.out.println("s) compose broadcast");
-            if (label != null && label.getType() == Label.Type.TRASH) {
-                System.out.println("e) empty trash");
-            }
-            System.out.println(COMMAND_BACK);
-
-            command = commandLine.nextCommand();
-            switch (command) {
-                case "c":
-                    compose(false);
-                    break;
-                case "s":
-                    compose(true);
-                    break;
-                case "e":
-                    messages.forEach(ctx.messages()::remove);
-                case "b":
-                    return;
-                default:
-                    try {
-                        int index = Integer.parseInt(command) - 1;
-                        show(messages.get(index));
-                    } catch (NumberFormatException | IndexOutOfBoundsException e) {
-                        System.out.println(ERROR_UNKNOWN_COMMAND);
-                    }
-            }
-        } while (!"b".equalsIgnoreCase(command));
-    }
-
-    private void show(Plaintext message) {
-        System.out.println();
-        System.out.println("From:    " + message.getFrom());
-        System.out.println("To:      " + message.getTo());
-        System.out.println("Subject: " + message.getSubject());
-        System.out.println();
-        System.out.println(WordUtils.wrap(message.getText(), 120));
-        System.out.println();
-        System.out.println(message.getLabels().stream().map(Label::toString).collect(
-            Collectors.joining(", ", "Labels: ", "")));
-        System.out.println();
-        ctx.labeler().markAsRead(message);
-        ctx.messages().save(message);
-        String command;
-        do {
-            System.out.println("r) reply");
-            System.out.println("d) delete");
-            System.out.println("a) archive");
-            System.out.println(COMMAND_BACK);
-            command = commandLine.nextCommand();
-            switch (command) {
-                case "r":
-                    compose(message.getTo(), message.getFrom(), message);
-                    break;
-                case "d":
-                    ctx.labeler().delete(message);
-                    ctx.messages().save(message);
-                    return;
-                case "a":
-                    ctx.labeler().archive(message);
-                    ctx.messages().save(message);
-                    return;
-                case "b":
-                    return;
-                default:
-                    System.out.println(ERROR_UNKNOWN_COMMAND);
-            }
-        } while (!"b".equalsIgnoreCase(command));
-    }
-
-    private void compose(boolean broadcast) {
-        System.out.println();
-        BitmessageAddress from = selectIdentity();
-        if (from == null) {
-            return;
-        }
-        BitmessageAddress to = (broadcast ? null : selectContact());
-        if (!broadcast && to == null) {
-            return;
-        }
-
-        compose(from, to, null);
-    }
-
-    private BitmessageAddress selectIdentity() {
-        List<BitmessageAddress> addresses = ctx.addresses().getIdentities();
-        while (addresses.size() == 0) {
-            addIdentity();
-            addresses = ctx.addresses().getIdentities();
-        }
-        return commandLine.selectAddress(addresses, "From:");
-    }
-
-    private BitmessageAddress selectContact() {
-        List<BitmessageAddress> addresses = ctx.addresses().getContacts();
-        while (addresses.size() == 0) {
-            addContact(false);
-            addresses = ctx.addresses().getContacts();
-        }
-        return commandLine.selectAddress(addresses, "To:");
-    }
-
-    private void compose(BitmessageAddress from, BitmessageAddress to, Plaintext parent) {
-        boolean broadcast = (to == null);
-        String subject;
-        System.out.println();
-        System.out.println("From:    " + from);
-        if (!broadcast) {
-            System.out.println("To:      " + to);
-        }
-        if (parent != null) {
-            if (RESPONSE_PATTERN.matcher(parent.getSubject()).matches()) {
-                subject = parent.getSubject();
-            } else {
-                subject = "RE: " + parent.getSubject();
-            }
-            System.out.println("Subject: " + subject);
-        } else {
-            System.out.print("Subject: ");
-            subject = commandLine.nextLineTrimmed();
-        }
-        System.out.println("Message:");
-        StringBuilder message = new StringBuilder();
-        String line;
-        do {
-            line = commandLine.nextLine();
-            message.append(line).append('\n');
-        } while (line.length() > 0 || !commandLine.yesNo("Send message?"));
-        Plaintext.Type type = broadcast ? Plaintext.Type.BROADCAST : Plaintext.Type.MSG;
-        Plaintext.Builder builder = new Plaintext.Builder(type);
-        builder.from(from);
-        builder.to(to);
-        if (commandLine.yesNo("Use extended encoding?")) {
-            Message.Builder extended = new Message.Builder();
-            extended.subject(subject).body(message.toString());
-            if (parent != null) {
-                extended.addParent(parent);
-            }
-            builder.message(extended.build());
-        } else {
-            builder.message(subject, message.toString());
-        }
-        ctx.send(builder.build());
-    }
-}
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/CommandLine.java b/demo/src/main/java/ch/dissem/bitmessage/demo/CommandLine.java
deleted file mode 100644
index f04196a..0000000
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/CommandLine.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2016 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage.demo;
-
-import ch.dissem.bitmessage.entity.BitmessageAddress;
-
-import java.util.List;
-import java.util.Scanner;
-
-
-/**
- * @author Christian Basler
- */
-public class CommandLine {
-    public static final String COMMAND_BACK = "b) back";
-    public static final String ERROR_UNKNOWN_COMMAND = "Unknown command. Please try again.";
-
-    private Scanner scanner = new Scanner(System.in);
-
-    public String nextCommand() {
-        return scanner.nextLine().trim().toLowerCase();
-    }
-
-    public String nextLine() {
-        return scanner.nextLine();
-    }
-
-    public String nextLineTrimmed() {
-        return scanner.nextLine();
-    }
-
-    public boolean yesNo(String question) {
-        String answer;
-        do {
-            System.out.println(question + " (y/n)");
-            answer = scanner.nextLine();
-            if ("y".equalsIgnoreCase(answer)) return true;
-            if ("n".equalsIgnoreCase(answer)) return false;
-        } while (true);
-    }
-
-    public BitmessageAddress selectAddress(List<BitmessageAddress> addresses, String label) {
-        if (addresses.size() == 1) {
-            return addresses.get(0);
-        }
-
-        String command;
-        do {
-            System.out.println();
-            System.out.println(label);
-
-            listAddresses(addresses, "contacts");
-            System.out.println(COMMAND_BACK);
-
-            command = nextCommand();
-            switch (command) {
-                case "b":
-                    return null;
-                default:
-                    try {
-                        int index = Integer.parseInt(command) - 1;
-                        if (addresses.get(index) != null) {
-                            return addresses.get(index);
-                        }
-                    } catch (NumberFormatException e) {
-                        System.out.println(ERROR_UNKNOWN_COMMAND);
-                    }
-            }
-        } while (!"b".equals(command));
-        return null;
-    }
-
-    public void listAddresses(List<BitmessageAddress> addresses, String kind) {
-        int i = 0;
-        for (BitmessageAddress address : addresses) {
-            i++;
-            System.out.print(i + ") ");
-            if (address.getAlias() == null) {
-                System.out.println(address.getAddress());
-            } else {
-                System.out.println(address.getAlias() + " (" + address.getAddress() + ")");
-            }
-        }
-        if (i == 0) {
-            System.out.println("You have no " + kind + " yet.");
-        }
-    }
-}
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
deleted file mode 100644
index 40ee063..0000000
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2015 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage.demo;
-
-import ch.dissem.bitmessage.BitmessageContext;
-import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
-import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
-import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
-import ch.dissem.bitmessage.ports.NodeRegistry;
-import ch.dissem.bitmessage.repository.*;
-import ch.dissem.bitmessage.wif.WifExporter;
-import ch.dissem.bitmessage.wif.WifImporter;
-import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.CmdLineParser;
-import org.kohsuke.args4j.Option;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class Main {
-    private static final Logger LOG = LoggerFactory.getLogger(Main.class);
-
-    public static void main(String[] args) throws IOException {
-        if (System.getProperty("org.slf4j.simpleLogger.defaultLogLevel") == null)
-            System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "ERROR");
-        if (System.getProperty("org.slf4j.simpleLogger.logFile") == null)
-            System.setProperty("org.slf4j.simpleLogger.logFile", "./jabit.log");
-
-        System.out.println("Version: " + BitmessageContext.getVersion());
-
-        CmdLineOptions options = new CmdLineOptions();
-        CmdLineParser parser = new CmdLineParser(options);
-        try {
-            parser.parseArgument(args);
-        } catch (CmdLineException e) {
-            parser.printUsage(System.err);
-        }
-
-        JdbcConfig jdbcConfig = new JdbcConfig();
-        BitmessageContext.Builder ctxBuilder = new BitmessageContext.Builder()
-            .addressRepo(new JdbcAddressRepository(jdbcConfig))
-            .inventory(new JdbcInventory(jdbcConfig))
-            .messageRepo(new JdbcMessageRepository(jdbcConfig))
-            .powRepo(new JdbcProofOfWorkRepository(jdbcConfig))
-            .networkHandler(new NioNetworkHandler())
-            .cryptography(new BouncyCryptography())
-            .port(48444);
-        if (options.localPort != null) {
-            ctxBuilder.nodeRegistry(new NodeRegistry() {
-                @Override
-                public void clear() {
-                    // NO OP
-                }
-
-                @Override
-                public List<NetworkAddress> getKnownAddresses(int limit, long... streams) {
-                    return Arrays.stream(streams)
-                        .mapToObj(s -> new NetworkAddress.Builder()
-                            .ipv4(127, 0, 0, 1)
-                            .port(options.localPort)
-                            .stream(s).build())
-                        .collect(Collectors.toList());
-                }
-
-                @Override
-                public void offerAddresses(List<NetworkAddress> nodes) {
-                    LOG.info("Local node registry ignored offered addresses: " + nodes);
-                }
-            });
-        } else {
-            ctxBuilder.nodeRegistry(new JdbcNodeRegistry(jdbcConfig));
-        }
-
-        if (options.exportWIF != null || options.importWIF != null) {
-            BitmessageContext ctx = ctxBuilder.build();
-
-            if (options.exportWIF != null) {
-                new WifExporter(ctx).addAll().write(options.exportWIF);
-            }
-            if (options.importWIF != null) {
-                new WifImporter(ctx, options.importWIF).importAll();
-            }
-        } else {
-            InetAddress syncServer = options.syncServer == null ? null : InetAddress.getByName(options.syncServer);
-            new Application(ctxBuilder, syncServer, options.syncPort);
-        }
-    }
-
-    private static class CmdLineOptions {
-        @Option(name = "-local", usage = "Connect to local Bitmessage client on given port, instead of the usual connections from node.txt")
-        private Integer localPort;
-
-        @Option(name = "-import", usage = "Import from keys.dat or other WIF file.")
-        private File importWIF;
-
-        @Option(name = "-export", usage = "Export to WIF file.")
-        private File exportWIF;
-
-        @Option(name = "-syncServer", usage = "Use manual synchronization with the given server instead of starting a full node.")
-        private String syncServer;
-
-        @Option(name = "-syncPort", usage = "Port to use for synchronisation")
-        private int syncPort = 8444;
-    }
-}
diff --git a/demo/src/main/kotlin/ch/dissem/bitmessage/demo/Application.kt b/demo/src/main/kotlin/ch/dissem/bitmessage/demo/Application.kt
new file mode 100644
index 0000000..dcb4fb8
--- /dev/null
+++ b/demo/src/main/kotlin/ch/dissem/bitmessage/demo/Application.kt
@@ -0,0 +1,453 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.demo
+
+import ch.dissem.bitmessage.BitmessageContext
+import ch.dissem.bitmessage.demo.CommandLine.Companion.COMMAND_BACK
+import ch.dissem.bitmessage.demo.CommandLine.Companion.ERROR_UNKNOWN_COMMAND
+import ch.dissem.bitmessage.entity.BitmessageAddress
+import ch.dissem.bitmessage.entity.Plaintext
+import ch.dissem.bitmessage.entity.Plaintext.Type.BROADCAST
+import ch.dissem.bitmessage.entity.Plaintext.Type.MSG
+import ch.dissem.bitmessage.entity.payload.Pubkey
+import ch.dissem.bitmessage.entity.valueobject.Label
+import ch.dissem.bitmessage.entity.valueobject.extended.Message
+import org.apache.commons.lang3.text.WordUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.net.InetAddress
+import kotlin.text.RegexOption.IGNORE_CASE
+
+/**
+ * A simple command line Bitmessage application
+ */
+class Application(
+    ctxBuilder: BitmessageContext.Builder,
+    syncServer: InetAddress? = null,
+    syncPort: Int = 8444
+) {
+    private val log: Logger by lazy { LoggerFactory.getLogger(Application::class.java) }
+    private val responsePattern: Regex by lazy { Regex("^RE:.*\$", IGNORE_CASE) }
+    private val commandLine: CommandLine by lazy { CommandLine() }
+
+    private val ctx: BitmessageContext
+
+    init {
+        ctx = ctxBuilder
+            .listener { plaintext -> println("New Message from ${plaintext.from}: ${plaintext.subject}") }
+            .build()
+
+        if (syncServer == null) {
+            ctx.startup()
+        }
+
+        var command: String
+        do {
+            println()
+            println("available commands:")
+            println("i) identities")
+            println("c) contacts")
+            println("s) subscriptions")
+            println("m) messages")
+            if (syncServer != null) {
+                println("y) sync")
+            }
+            println("?) info")
+            println("e) exit")
+
+            command = commandLine.nextLine()
+            try {
+                when (command) {
+                    "i" -> identities()
+                    "c" -> contacts()
+                    "s" -> subscriptions()
+                    "m" -> labels()
+                    "?" -> info()
+                    "e" -> {} //noop
+                    "y" -> {
+                        if (syncServer != null) {
+                            ctx.synchronize(syncServer, syncPort, 120, true)
+                        }
+                    }
+                    else -> println(ERROR_UNKNOWN_COMMAND)
+                }
+            } catch (e: Exception) {
+                log.debug(e.message)
+            }
+        } while ("e" != command)
+        log.info("Shutting down client")
+        ctx.cleanup()
+        ctx.shutdown()
+    }
+
+    private fun info() {
+        var command: String
+        do {
+            println()
+            println(ctx.status())
+            println()
+            println("c) cleanup inventory")
+            println("r) resend unacknowledged messages")
+            println(COMMAND_BACK)
+
+            command = commandLine.nextCommand()
+            when (command) {
+                "c" -> ctx.cleanup()
+                "r" -> ctx.resendUnacknowledgedMessages()
+                "b" -> return
+            }
+        } while ("b" != command)
+    }
+
+    private fun identities() {
+        var command: String
+        var identities = ctx.addresses.getIdentities()
+        do {
+            println()
+            commandLine.listAddresses(identities, "identities")
+            println("a) create identity")
+            println("c) join chan")
+            println(COMMAND_BACK)
+
+            command = commandLine.nextCommand()
+            when (command) {
+                "a" -> {
+                    addIdentity()
+                    identities = ctx.addresses.getIdentities()
+                }
+                "c" -> {
+                    joinChan()
+                    identities = ctx.addresses.getIdentities()
+                }
+                "b" -> return
+                else -> try {
+                    val index = command.toInt()
+                    address(identities[index])
+                } catch (e: NumberFormatException) {
+                    println(ERROR_UNKNOWN_COMMAND)
+                }
+            }
+        } while ("b" != command)
+    }
+
+    private fun addIdentity() {
+        println()
+        val identity = ctx.createIdentity(commandLine.yesNo("would you like a shorter address? This will take some time to calculate."), Pubkey.Feature.DOES_ACK)
+        println("Please enter an alias for this identity, or an empty string for none")
+        val alias = commandLine.nextLineTrimmed()
+        if (alias.isNotEmpty()) {
+            identity.alias = alias
+        }
+        ctx.addresses.save(identity)
+    }
+
+    private fun joinChan() {
+        println()
+        println("Passphrase: ")
+        val passphrase = commandLine.nextLine()
+        println("Address: ")
+        val address = commandLine.nextLineTrimmed()
+        ctx.joinChan(passphrase, address)
+    }
+
+    private fun contacts() {
+        var command: String
+        var contacts = ctx.addresses.getContacts()
+        do {
+            println()
+            commandLine.listAddresses(contacts, "contacts")
+            println()
+            println("a) add contact")
+            println(COMMAND_BACK)
+
+            command = commandLine.nextCommand()
+            when (command) {
+                "a" -> {
+                    addContact(false)
+                    contacts = ctx.addresses.getContacts()
+                }
+                "b" -> return
+                else -> try {
+                    val index = command.toInt()
+                    address(contacts[index])
+                } catch (e: NumberFormatException) {
+                    println(ERROR_UNKNOWN_COMMAND)
+                }
+            }
+        } while ("b" != command)
+    }
+
+    private fun addContact(isSubscription: Boolean) {
+        println()
+        println("Please enter the Bitmessage address you want to add")
+        try {
+            val address = BitmessageAddress(commandLine.nextLineTrimmed())
+            println("Please enter an alias for this address, or an empty string for none")
+            val alias = commandLine.nextLineTrimmed()
+            when {
+                alias.isNotEmpty() -> address.alias = alias
+                isSubscription -> ctx.addSubscribtion(address)
+            }
+            ctx.addContact(address)
+        } catch (e: IllegalArgumentException) {
+            println(e.message)
+        }
+    }
+
+    private fun subscriptions() {
+        var command: String
+        var subscriptions = ctx.addresses.getSubscriptions()
+        do {
+            println()
+            commandLine.listAddresses(subscriptions, "subscriptions")
+            println()
+            println("a) add subscription")
+            println(COMMAND_BACK)
+
+            command = commandLine.nextCommand()
+            when (command) {
+                "a" -> {
+                    addContact(true)
+                    subscriptions = ctx.addresses.getSubscriptions()
+                }
+                "b" -> return
+                else -> try {
+                    val index = command.toInt()
+                    address(subscriptions[index])
+                } catch (e: NumberFormatException) {
+                    println(ERROR_UNKNOWN_COMMAND)
+                }
+            }
+        } while ("b" != command)
+    }
+
+    private fun address(address: BitmessageAddress) {
+        println()
+        if (address.alias != null) {
+            println(address.alias)
+        }
+        println(address.address)
+        println("Stream:  ${address.stream}")
+        println("Version: ${address.version}")
+        if (address.privateKey == null) {
+            if (address.pubkey == null) {
+                println("Public key still missing")
+            } else {
+                println("Public key available")
+            }
+        } else {
+            if (address.isChan) {
+                println("Chan")
+            } else {
+                println("Identity")
+            }
+        }
+    }
+
+    private fun labels() {
+        val labels = ctx.messages.getLabels()
+        var command: String
+        do {
+            println()
+            labels.forEachIndexed { index, label ->
+                print("$index) $label")
+                val unread = ctx.messages.countUnread(label)
+                if (unread > 0) {
+                    println(" [$unread]")
+                } else {
+                    println()
+                }
+            }
+            println("a) Archive")
+            println()
+            println("c) compose message")
+            println("s) compose broadcast")
+            println(COMMAND_BACK)
+
+            command = commandLine.nextCommand()
+            when (command) {
+                "a" -> messages(null)
+                "c" -> compose(false)
+                "s" -> compose(true)
+                "b" -> return
+                else -> try {
+                    val index = command.toInt()
+                    messages(labels[index])
+                } catch (e: NumberFormatException) {
+                    println(ERROR_UNKNOWN_COMMAND)
+                } catch (e: IndexOutOfBoundsException) {
+                    println(ERROR_UNKNOWN_COMMAND)
+                }
+            }
+        } while ("b" != command)
+    }
+
+    private fun messages(label: Label?) {
+        var command: String
+        do {
+            val messages = ctx.messages.findMessages(label)
+            println()
+            if (messages.isEmpty()) {
+                println("There are no messages.")
+            }
+            messages.forEachIndexed { index, message ->
+                println("$index" + (if (message.isUnread()) ">" else ")") + " From: ${message.from} ; Subject: ${message.subject}")
+            }
+            println()
+            println("c) compose message")
+            println("s) compose broadcast")
+            if (label != null && label.type === Label.Type.TRASH) {
+                println("e) empty trash")
+            }
+            println(CommandLine.COMMAND_BACK)
+
+            command = commandLine.nextCommand()
+            when (command) {
+                "c" -> compose(false)
+                "s" -> compose(true)
+                "e" -> {
+                    messages.forEach { ctx.messages.remove(it) }
+                    return
+                }
+                "b" -> return
+                else -> try {
+                    val index = command.toInt()
+                    show(messages[index])
+                } catch (e: NumberFormatException) {
+                    println(CommandLine.ERROR_UNKNOWN_COMMAND)
+                } catch (e: IndexOutOfBoundsException) {
+                    println(CommandLine.ERROR_UNKNOWN_COMMAND)
+                }
+            }
+        } while ("b" != command)
+    }
+
+    private fun show(message: Plaintext) {
+        println()
+        println("From:    ${message.from}")
+        println("To:      ${message.to}")
+        println("Subject: ${message.subject}")
+        println()
+        println(WordUtils.wrap(message.text, 120))
+        println()
+        println(message.labels.joinToString(", ", "Labels: ") { it.toString() })
+        println()
+        ctx.labeler.markAsRead(message)
+        ctx.messages.save(message)
+
+        var command: String
+        do {
+            println("r) reply")
+            println("d) delete")
+            println("a) archive")
+            println(COMMAND_BACK)
+            command = commandLine.nextCommand()
+            when (command) {
+                //TODO: What should be done if 'to' is null? Also: Are 'to' and 'from' in the right order here
+                "r" -> compose(message.to!!, message.from, message)
+                "d" -> {
+                    ctx.labeler.delete(message)
+                    ctx.messages.save(message)
+                    return
+                }
+                "a" -> {
+                    ctx.labeler.archive(message)
+                    ctx.messages.save(message)
+                    return
+                }
+                "b" -> return
+                else -> println(ERROR_UNKNOWN_COMMAND)
+            }
+        } while ("b" != command)
+    }
+
+    private fun compose(broadcast: Boolean) {
+        println()
+        val from = selectIdentity() ?: return
+        val to = if (broadcast) null else selectContact()
+        if (!broadcast && to == null) {
+            return
+        }
+        compose(from, to, null)
+    }
+
+    private fun selectIdentity(): BitmessageAddress? {
+        var addresses = ctx.addresses.getIdentities()
+        while (addresses.isEmpty()) {
+            addIdentity()
+            addresses = ctx.addresses.getIdentities()
+        }
+        return commandLine.selectAddress(addresses, "From:")
+    }
+
+    private fun selectContact(): BitmessageAddress? {
+        var addresses = ctx.addresses.getContacts()
+        while (addresses.isEmpty()) {
+            addContact(false)
+            addresses = ctx.addresses.getContacts()
+        }
+        return commandLine.selectAddress(addresses, "To:")
+    }
+
+    private fun compose(from: BitmessageAddress, to: BitmessageAddress?, parent: Plaintext?) {
+        val broadcast = to == null
+        val subject: String
+        println()
+        println("From:    $from")
+        if (!broadcast) {
+            println("To:      $to")
+        }
+        if (parent != null) {
+            subject = if (responsePattern.matches(parent.subject!!)) {
+                //TODO: Is this truly safe?
+                parent.subject!!
+            } else {
+                "RE: ${parent.subject}"
+            }
+            println("Subject: $subject")
+        } else {
+            print("Subject: ")
+            subject = commandLine.nextLineTrimmed()
+        }
+        println("Message:")
+
+        val message = buildString {
+            var line: String
+            do {
+                line = commandLine.nextLine()
+                append(line)
+            } while (line.isNotEmpty() || !commandLine.yesNo("Send message?"))
+        }
+
+        val type = if (broadcast) BROADCAST else MSG
+        val builder = Plaintext.Builder(type)
+        builder.from(from)
+        builder.to(to)
+
+        if (commandLine.yesNo("Use extended encoding?")) {
+            val extended = Message.Builder()
+            extended.subject(subject).body(message)
+            if (parent != null) {
+                extended.addParent(parent)
+            }
+            builder.message(extended.build())
+        } else {
+            builder.message(subject, message)
+        }
+        ctx.send(builder.build())
+    }
+}
diff --git a/demo/src/main/kotlin/ch/dissem/bitmessage/demo/CommandLine.kt b/demo/src/main/kotlin/ch/dissem/bitmessage/demo/CommandLine.kt
new file mode 100644
index 0000000..7a1cb45
--- /dev/null
+++ b/demo/src/main/kotlin/ch/dissem/bitmessage/demo/CommandLine.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.demo
+
+import ch.dissem.bitmessage.entity.BitmessageAddress
+import java.util.*
+
+class CommandLine {
+
+    companion object {
+        val COMMAND_BACK = "b) back"
+        val ERROR_UNKNOWN_COMMAND = "Unknown command. Please try again."
+    }
+
+    private val scanner: Scanner by lazy { Scanner(System.`in`) }
+
+    fun nextCommand() = scanner.nextLine().trim().toLowerCase()
+
+    fun nextLine(): String = scanner.nextLine()
+
+    fun nextLineTrimmed(): String = scanner.nextLine().trim()
+
+    fun yesNo(question: String): Boolean {
+        var answer: String
+        while (true) {
+            println("$question (y/n)")
+            answer = nextLine()
+            when (answer.toLowerCase()) {
+                "y" -> return true
+                "n" -> return false
+            }
+        }
+    }
+
+    fun selectAddress(addresses: List<BitmessageAddress>, label: String): BitmessageAddress? {
+        if (addresses.size == 1) {
+            return addresses[0]
+        }
+
+        var command: String
+        do {
+            println()
+            println(label)
+
+            listAddresses(addresses, "contacts")
+            println(COMMAND_BACK)
+
+            command = nextCommand()
+            when (command) {
+                "b" -> return null
+                else -> try {
+                    val index = command.toInt() - 1
+                    return addresses[index]
+                } catch (e: NumberFormatException) {
+                    println(ERROR_UNKNOWN_COMMAND)
+                }
+            }
+        } while ("b" != command)
+        return null
+    }
+
+    fun listAddresses(addresses: List<BitmessageAddress>, kind: String) {
+        if (addresses.isEmpty()) {
+            println("You have no $kind yet.")
+        } else {
+            addresses.forEachIndexed { index, address ->
+                print("$index) ")
+                if (address.alias == null) {
+                    println(address.address)
+                } else {
+                    println("${address.alias} (${address.address})")
+                }
+            }
+        }
+    }
+}
diff --git a/demo/src/main/kotlin/ch/dissem/bitmessage/demo/Main.kt b/demo/src/main/kotlin/ch/dissem/bitmessage/demo/Main.kt
new file mode 100644
index 0000000..637e3f1
--- /dev/null
+++ b/demo/src/main/kotlin/ch/dissem/bitmessage/demo/Main.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.demo
+
+import ch.dissem.bitmessage.BitmessageContext
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress
+import ch.dissem.bitmessage.networking.nio.NioNetworkHandler
+import ch.dissem.bitmessage.ports.NodeRegistry
+import ch.dissem.bitmessage.repository.*
+import ch.dissem.bitmessage.wif.WifExporter
+import ch.dissem.bitmessage.wif.WifImporter
+import org.kohsuke.args4j.CmdLineException
+import org.kohsuke.args4j.CmdLineParser
+import org.kohsuke.args4j.Option
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.io.File
+import java.net.InetAddress
+
+class Main {
+
+    companion object {
+        private val log: Logger by lazy { LoggerFactory.getLogger(Main::class.java) }
+
+        @JvmStatic fun main(args: Array<String>) {
+            when {
+                System.getProperty("org.slf4j.simpleLogger.defaultLogLevel") == null ->
+                    System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "ERROR")
+                System.getProperty("org.slf4j.simpleLogger.logFile") == null ->
+                    System.setProperty("org.slf4j.simpleLogger.logFile", "./jabit.log")
+            }
+
+            println("Version: ${BitmessageContext.version}")
+
+            val options = CmdLineOptions()
+            val parser = CmdLineParser(options)
+            try {
+                parser.parseArgument(*args)
+            } catch (e: CmdLineException) {
+                parser.printUsage(System.err)
+            }
+
+            val jdbcConfig = JdbcConfig()
+            val ctxBuilder = BitmessageContext.Builder()
+                .addressRepo(JdbcAddressRepository(jdbcConfig))
+                .inventory(JdbcInventory(jdbcConfig))
+                .messageRepo(JdbcMessageRepository(jdbcConfig))
+                .powRepo(JdbcProofOfWorkRepository(jdbcConfig))
+                .networkHandler(NioNetworkHandler())
+                .cryptography(BouncyCryptography())
+                .port(48444)
+
+            if (options.localPort != null) {
+                ctxBuilder.nodeRegistry(object : NodeRegistry {
+                    override fun clear() { /*NO OP*/ }
+
+                    override fun getKnownAddresses(limit: Int, vararg streams: Long): List<NetworkAddress> {
+                        return streams.map {
+                            NetworkAddress.Builder()
+                                .ipv4(127, 0, 0, 1)
+                                .port(options.localPort!!)
+                                .stream(it)
+                                .build()
+                        }
+                    }
+
+                    override fun offerAddresses(nodes: List<NetworkAddress>) {
+                        log.info("Local node registry ignored offered addresses: $nodes")
+                    }
+                })
+            } else {
+                ctxBuilder.nodeRegistry(JdbcNodeRegistry(jdbcConfig))
+            }
+
+            if (options.exportWIF != null || options.importWIF != null) {
+                val ctx = ctxBuilder.build()
+                when {
+                    options.exportWIF != null -> WifExporter(ctx).addAll().write(options.exportWIF!!)
+                    options.importWIF != null -> WifImporter(ctx, options.importWIF!!).importAll()
+                }
+            } else {
+                val syncServer = if (options.syncServer == null) null else InetAddress.getByName(options.syncServer)
+                Application(ctxBuilder, syncServer, options.syncPort)
+            }
+        }
+    }
+
+    private class CmdLineOptions {
+        @Option(name = "-local", usage = "Connect to local Bitmessage client on given port, instead of the usual connections from node.txt")
+        var localPort: Int? = null
+
+        @Option(name = "-import", usage = "Import from keys.dat or other WIF file.")
+        var importWIF: File? = null
+
+        @Option(name = "-export", usage = "Export to WIF file.")
+        var exportWIF: File? = null
+
+        @Option(name = "-syncServer", usage = "Use manual synchronization with the given server instead of starting a full node.")
+        var syncServer: String? = null
+
+        @Option(name = "-syncPort", usage = "Port to use for synchronisation")
+        var syncPort = 8444
+    }
+}
diff --git a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
deleted file mode 100644
index 2cfe84f..0000000
--- a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright 2016 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage;
-
-import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
-import ch.dissem.bitmessage.entity.BitmessageAddress;
-import ch.dissem.bitmessage.entity.Plaintext;
-import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
-import ch.dissem.bitmessage.ports.DefaultLabeler;
-import ch.dissem.bitmessage.ports.Labeler;
-import ch.dissem.bitmessage.repository.*;
-import ch.dissem.bitmessage.utils.TTL;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK;
-import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
-import static com.nhaarman.mockito_kotlin.MockitoKt.spy;
-import static com.nhaarman.mockito_kotlin.MockitoKt.timeout;
-import static com.nhaarman.mockito_kotlin.MockitoKt.verify;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-
-/**
- * @author Christian Basler
- */
-public class SystemTest {
-    private static int port = 6000;
-
-    private BitmessageContext alice;
-    private BitmessageAddress aliceIdentity;
-    private Labeler aliceLabeler;
-
-    private BitmessageContext bob;
-    private TestListener bobListener;
-    private BitmessageAddress bobIdentity;
-
-    @Before
-    public void setUp() {
-        TTL.msg(5 * MINUTE);
-        TTL.getpubkey(5 * MINUTE);
-        TTL.pubkey(5 * MINUTE);
-
-        int alicePort = port++;
-        int bobPort = port++;
-        {
-            JdbcConfig aliceDB = new JdbcConfig("jdbc:h2:mem:alice;DB_CLOSE_DELAY=-1", "sa", "");
-            aliceLabeler = spy(new DebugLabeler("Alice"));
-            TestListener aliceListener = new TestListener();
-            alice = new BitmessageContext.Builder()
-                .addressRepo(new JdbcAddressRepository(aliceDB))
-                .inventory(new JdbcInventory(aliceDB))
-                .messageRepo(new JdbcMessageRepository(aliceDB))
-                .powRepo(new JdbcProofOfWorkRepository(aliceDB))
-                .port(alicePort)
-                .nodeRegistry(new TestNodeRegistry(bobPort))
-                .networkHandler(new NioNetworkHandler())
-                .cryptography(new BouncyCryptography())
-                .listener(aliceListener)
-                .labeler(aliceLabeler)
-                .build();
-            alice.startup();
-            aliceIdentity = alice.createIdentity(false, DOES_ACK);
-        }
-        {
-            JdbcConfig bobDB = new JdbcConfig("jdbc:h2:mem:bob;DB_CLOSE_DELAY=-1", "sa", "");
-            bobListener = new TestListener();
-            bob = new BitmessageContext.Builder()
-                .addressRepo(new JdbcAddressRepository(bobDB))
-                .inventory(new JdbcInventory(bobDB))
-                .messageRepo(new JdbcMessageRepository(bobDB))
-                .powRepo(new JdbcProofOfWorkRepository(bobDB))
-                .port(bobPort)
-                .nodeRegistry(new TestNodeRegistry(alicePort))
-                .networkHandler(new NioNetworkHandler())
-                .cryptography(new BouncyCryptography())
-                .listener(bobListener)
-                .labeler(new DebugLabeler("Bob"))
-                .build();
-            bob.startup();
-            bobIdentity = bob.createIdentity(false, DOES_ACK);
-        }
-        ((DebugLabeler) alice.labeler()).init(aliceIdentity, bobIdentity);
-        ((DebugLabeler) bob.labeler()).init(aliceIdentity, bobIdentity);
-    }
-
-    @After
-    public void tearDown() {
-        alice.shutdown();
-        bob.shutdown();
-    }
-
-    @Test(timeout = 120_000)
-    public void ensureAliceCanSendMessageToBob() throws Exception {
-        String originalMessage = UUID.randomUUID().toString();
-        alice.send(aliceIdentity, new BitmessageAddress(bobIdentity.getAddress()), "Subject", originalMessage);
-
-        Plaintext plaintext = bobListener.get(2, TimeUnit.MINUTES);
-
-        assertThat(plaintext.getType(), equalTo(Plaintext.Type.MSG));
-        assertThat(plaintext.getText(), equalTo(originalMessage));
-
-        verify(aliceLabeler, timeout(TimeUnit.MINUTES.toMillis(2)).atLeastOnce())
-            .markAsAcknowledged(any());
-    }
-
-    @Test(timeout = 30_000)
-    public void ensureBobCanReceiveBroadcastFromAlice() throws Exception {
-        String originalMessage = UUID.randomUUID().toString();
-        bob.addSubscribtion(new BitmessageAddress(aliceIdentity.getAddress()));
-        alice.broadcast(aliceIdentity, "Subject", originalMessage);
-
-        Plaintext plaintext = bobListener.get(15, TimeUnit.MINUTES);
-
-        assertThat(plaintext.getType(), equalTo(Plaintext.Type.BROADCAST));
-        assertThat(plaintext.getText(), equalTo(originalMessage));
-    }
-
-    private static class DebugLabeler extends DefaultLabeler {
-        private final Logger LOG = LoggerFactory.getLogger("Labeler");
-        final String name;
-        String alice;
-        String bob;
-
-        private DebugLabeler(String name) {
-            this.name = name;
-        }
-
-        private void init(BitmessageAddress alice, BitmessageAddress bob) {
-            this.alice = alice.getAddress();
-            this.bob = bob.getAddress();
-        }
-
-        @Override
-        public void setLabels(Plaintext msg) {
-            LOG.info(name + ": From " + name(msg.getFrom()) + ": Received");
-            super.setLabels(msg);
-        }
-
-        @Override
-        public void markAsDraft(Plaintext msg) {
-            LOG.info(name + ": From " + name(msg.getFrom()) + ": Draft");
-            super.markAsDraft(msg);
-        }
-
-        @Override
-        public void markAsSending(Plaintext msg) {
-            LOG.info(name + ": From " + name(msg.getFrom()) + ": Sending");
-            super.markAsSending(msg);
-        }
-
-        @Override
-        public void markAsSent(Plaintext msg) {
-            LOG.info(name + ": From " + name(msg.getFrom()) + ": Sent");
-            super.markAsSent(msg);
-        }
-
-        @Override
-        public void markAsAcknowledged(Plaintext msg) {
-            LOG.info(name + ": From " + name(msg.getFrom()) + ": Acknowledged");
-            super.markAsAcknowledged(msg);
-        }
-
-        @Override
-        public void markAsRead(Plaintext msg) {
-            LOG.info(name + ": From " + name(msg.getFrom()) + ": Read");
-            super.markAsRead(msg);
-        }
-
-        @Override
-        public void markAsUnread(Plaintext msg) {
-            LOG.info(name + ": From " + name(msg.getFrom()) + ": Unread");
-            super.markAsUnread(msg);
-        }
-
-        @Override
-        public void delete(Plaintext msg) {
-            LOG.info(name + ": From " + name(msg.getFrom()) + ": Cleared");
-            super.delete(msg);
-        }
-
-        @Override
-        public void archive(Plaintext msg) {
-            LOG.info(name + ": From " + name(msg.getFrom()) + ": Archived");
-            super.archive(msg);
-        }
-
-        private String name(BitmessageAddress address) {
-            if (alice.equals(address.getAddress()))
-                return "Alice";
-            else if (bob.equals(address.getAddress()))
-                return "Bob";
-            else
-                return "Unknown (" + address.getAddress() + ")";
-        }
-    }
-}
diff --git a/demo/src/test/java/ch/dissem/bitmessage/TestNodeRegistry.java b/demo/src/test/java/ch/dissem/bitmessage/TestNodeRegistry.java
deleted file mode 100644
index 09f7a85..0000000
--- a/demo/src/test/java/ch/dissem/bitmessage/TestNodeRegistry.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2015 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage;
-
-import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
-import ch.dissem.bitmessage.ports.NodeRegistry;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Empty {@link NodeRegistry} that doesn't do anything, but shouldn't break things either.
- */
-class TestNodeRegistry implements NodeRegistry {
-    private List<NetworkAddress> nodes = new LinkedList<>();
-
-    public TestNodeRegistry(int... ports) {
-        for (int port : ports) {
-            nodes.add(
-                new NetworkAddress.Builder()
-                    .ipv4(127, 0, 0, 1)
-                    .port(port)
-                    .build()
-            );
-        }
-    }
-
-    @Override
-    public void clear() {
-        // NO OP
-    }
-
-    @Override
-    public List<NetworkAddress> getKnownAddresses(int limit, long... streams) {
-        return nodes;
-    }
-
-    @Override
-    public void offerAddresses(List<NetworkAddress> nodes) {
-        // Ignore
-    }
-}
diff --git a/demo/src/test/kotlin/ch/dissem/bitmessage/SystemTest.kt b/demo/src/test/kotlin/ch/dissem/bitmessage/SystemTest.kt
new file mode 100644
index 0000000..ef92ea8
--- /dev/null
+++ b/demo/src/test/kotlin/ch/dissem/bitmessage/SystemTest.kt
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage
+
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography
+import ch.dissem.bitmessage.entity.BitmessageAddress
+import ch.dissem.bitmessage.entity.Plaintext
+import ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK
+import ch.dissem.bitmessage.networking.nio.NioNetworkHandler
+import ch.dissem.bitmessage.ports.DefaultLabeler
+import ch.dissem.bitmessage.ports.Labeler
+import ch.dissem.bitmessage.repository.*
+import ch.dissem.bitmessage.utils.TTL
+import ch.dissem.bitmessage.utils.UnixTime.MINUTE
+import com.nhaarman.mockito_kotlin.anyOrNull
+import com.nhaarman.mockito_kotlin.spy
+import com.nhaarman.mockito_kotlin.timeout
+import com.nhaarman.mockito_kotlin.verify
+import org.hamcrest.CoreMatchers.equalTo
+import org.junit.After
+import org.junit.Assert.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.slf4j.LoggerFactory
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+class SystemTest {
+    private var port = 6000
+
+    private lateinit var alice: BitmessageContext
+    private lateinit var aliceIdentity: BitmessageAddress
+    private lateinit var aliceLabeler: Labeler
+
+    private lateinit var bob: BitmessageContext
+    private lateinit var bobListener: TestListener
+    private lateinit var bobIdentity: BitmessageAddress
+
+    @Before
+    fun setUp() {
+        TTL.msg = 5 * MINUTE
+        TTL.getpubkey = 5 * MINUTE
+        TTL.pubkey = 5 * MINUTE
+
+        val alicePort = port++
+        val bobPort = port++
+        run {
+            val aliceDB = JdbcConfig("jdbc:h2:mem:alice;DB_CLOSE_DELAY=-1", "sa", "")
+            aliceLabeler = spy(DebugLabeler("Alice"))
+            val aliceListener = TestListener()
+            alice = BitmessageContext.Builder()
+                .addressRepo(JdbcAddressRepository(aliceDB))
+                .inventory(JdbcInventory(aliceDB))
+                .messageRepo(JdbcMessageRepository(aliceDB))
+                .powRepo(JdbcProofOfWorkRepository(aliceDB))
+                .port(alicePort)
+                .nodeRegistry(TestNodeRegistry(bobPort))
+                .networkHandler(NioNetworkHandler())
+                .cryptography(BouncyCryptography())
+                .listener(aliceListener)
+                .labeler(aliceLabeler)
+                .build()
+            alice.startup()
+            aliceIdentity = alice.createIdentity(false, DOES_ACK)
+        }
+        run {
+            val bobDB = JdbcConfig("jdbc:h2:mem:bob;DB_CLOSE_DELAY=-1", "sa", "")
+            bobListener = TestListener()
+            bob = BitmessageContext.Builder()
+                .addressRepo(JdbcAddressRepository(bobDB))
+                .inventory(JdbcInventory(bobDB))
+                .messageRepo(JdbcMessageRepository(bobDB))
+                .powRepo(JdbcProofOfWorkRepository(bobDB))
+                .port(bobPort)
+                .nodeRegistry(TestNodeRegistry(alicePort))
+                .networkHandler(NioNetworkHandler())
+                .cryptography(BouncyCryptography())
+                .listener(bobListener)
+                .labeler(DebugLabeler("Bob"))
+                .build()
+            bob.startup()
+            bobIdentity = bob.createIdentity(false, DOES_ACK)
+        }
+        (alice.labeler as DebugLabeler).init(aliceIdentity, bobIdentity)
+        (bob.labeler as DebugLabeler).init(aliceIdentity, bobIdentity)
+    }
+
+    @After
+    fun tearDown() {
+        alice.shutdown()
+        bob.shutdown()
+    }
+
+    @Test(timeout = 120_000)
+    fun `ensure Alice can send message to Bob`() {
+        val originalMessage = UUID.randomUUID().toString()
+        alice.send(aliceIdentity, BitmessageAddress(bobIdentity.address), "Subject", originalMessage)
+
+        val plaintext = bobListener[2, TimeUnit.MINUTES]
+
+        assertThat(plaintext.type, equalTo(Plaintext.Type.MSG))
+        assertThat(plaintext.text, equalTo(originalMessage))
+
+        //TODO: Something must be off here because the 'anyOrNull' matcher does not seem necessary but without it the test fails
+        verify(aliceLabeler, timeout(TimeUnit.MINUTES.toMillis(2)).atLeastOnce()).markAsAcknowledged(anyOrNull())
+    }
+
+    @Test(timeout = 30_000)
+    fun `ensure Bob can receive broadcast from Alice`() {
+        val originalMessage = UUID.randomUUID().toString()
+        bob.addSubscribtion(BitmessageAddress(aliceIdentity.address))
+        alice.broadcast(aliceIdentity, "Subject", originalMessage)
+
+        val plaintext = bobListener[15, TimeUnit.MINUTES]
+
+        assertThat(plaintext.type, equalTo(Plaintext.Type.BROADCAST))
+        assertThat(plaintext.text, equalTo(originalMessage))
+    }
+
+    private class DebugLabeler constructor(internal val name: String) : DefaultLabeler() {
+        private val LOG = LoggerFactory.getLogger("Labeler")
+        internal lateinit var alice: String
+        internal lateinit var bob: String
+
+        fun init(alice: BitmessageAddress, bob: BitmessageAddress) {
+            this.alice = alice.address
+            this.bob = bob.address
+        }
+
+        override fun setLabels(msg: Plaintext) {
+            LOG.info(name + ": From " + name(msg.from) + ": Received")
+            super.setLabels(msg)
+        }
+
+        override fun markAsDraft(msg: Plaintext) {
+            LOG.info(name + ": From " + name(msg.from) + ": Draft")
+            super.markAsDraft(msg)
+        }
+
+        override fun markAsSending(msg: Plaintext) {
+            LOG.info(name + ": From " + name(msg.from) + ": Sending")
+            super.markAsSending(msg)
+        }
+
+        override fun markAsSent(msg: Plaintext) {
+            LOG.info(name + ": From " + name(msg.from) + ": Sent")
+            super.markAsSent(msg)
+        }
+
+        override fun markAsAcknowledged(msg: Plaintext) {
+            LOG.info(name + ": From " + name(msg.from) + ": Acknowledged")
+            super.markAsAcknowledged(msg)
+        }
+
+        override fun markAsRead(msg: Plaintext) {
+            LOG.info(name + ": From " + name(msg.from) + ": Read")
+            super.markAsRead(msg)
+        }
+
+        override fun markAsUnread(msg: Plaintext) {
+            LOG.info(name + ": From " + name(msg.from) + ": Unread")
+            super.markAsUnread(msg)
+        }
+
+        override fun delete(msg: Plaintext) {
+            LOG.info(name + ": From " + name(msg.from) + ": Cleared")
+            super.delete(msg)
+        }
+
+        override fun archive(msg: Plaintext) {
+            LOG.info(name + ": From " + name(msg.from) + ": Archived")
+            super.archive(msg)
+        }
+
+        private fun name(address: BitmessageAddress): String {
+            return when {
+                alice == address.address -> "Alice"
+                bob == address.address -> "Bob"
+                else -> "Unknown (" + address.address + ")"
+            }
+        }
+    }
+}
diff --git a/demo/src/test/java/ch/dissem/bitmessage/TestListener.kt b/demo/src/test/kotlin/ch/dissem/bitmessage/TestListener.kt
similarity index 96%
rename from demo/src/test/java/ch/dissem/bitmessage/TestListener.kt
rename to demo/src/test/kotlin/ch/dissem/bitmessage/TestListener.kt
index abb1bfd..e11e54f 100644
--- a/demo/src/test/java/ch/dissem/bitmessage/TestListener.kt
+++ b/demo/src/test/kotlin/ch/dissem/bitmessage/TestListener.kt
@@ -32,7 +32,7 @@ class TestListener : BitmessageContext.Listener {
     }
 
     fun reset() {
-        future = CompletableFuture<Plaintext>()
+        future = CompletableFuture()
     }
 
     operator fun get(timeout: Long, unit: TimeUnit): Plaintext {
diff --git a/demo/src/test/kotlin/ch/dissem/bitmessage/TestNodeRegistry.kt b/demo/src/test/kotlin/ch/dissem/bitmessage/TestNodeRegistry.kt
new file mode 100644
index 0000000..039f87f
--- /dev/null
+++ b/demo/src/test/kotlin/ch/dissem/bitmessage/TestNodeRegistry.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage
+
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress
+import ch.dissem.bitmessage.ports.NodeRegistry
+import java.util.*
+
+/**
+ * Empty [NodeRegistry] that doesn't do anything, but shouldn't break things either.
+ */
+class TestNodeRegistry(vararg ports: Int) : NodeRegistry {
+
+    private val nodes = LinkedList<NetworkAddress>()
+
+    init {
+        ports.map { NetworkAddress.Builder().ipv4(127, 0, 0, 1).port(it).build() }.toCollection(nodes)
+    }
+
+    override fun clear() {
+        // NO OP
+    }
+
+    override fun getKnownAddresses(limit: Int, vararg streams: Long) = nodes
+
+    override fun offerAddresses(nodes: List<NetworkAddress>) {
+        // Ignore
+    }
+}
diff --git a/demo/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/demo/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000..1f0955d
--- /dev/null
+++ b/demo/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/networking/src/test/kotlin/ch/dissem/bitmessage/networking/NetworkHandlerTest.kt b/networking/src/test/kotlin/ch/dissem/bitmessage/networking/NetworkHandlerTest.kt
index 4eaface..80f9c7b 100644
--- a/networking/src/test/kotlin/ch/dissem/bitmessage/networking/NetworkHandlerTest.kt
+++ b/networking/src/test/kotlin/ch/dissem/bitmessage/networking/NetworkHandlerTest.kt
@@ -31,7 +31,8 @@ import com.nhaarman.mockito_kotlin.mock
 import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.notNullValue
 import org.junit.After
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertThat
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -233,7 +234,7 @@ class NetworkHandlerTest {
         private val peerAddress = NetworkAddress.Builder().ipv4(127, 0, 0, 1).port(6001).build()
 
         private fun shutdown(ctx: BitmessageContext) {
-            if (!ctx.isRunning) return
+            if (!ctx.isRunning()) return
 
             ctx.shutdown()
             do {
@@ -242,7 +243,7 @@ class NetworkHandlerTest {
                 } catch (ignore: InterruptedException) {
                 }
 
-            } while (ctx.isRunning)
+            } while (ctx.isRunning())
         }
 
         private fun shutdown(networkHandler: NetworkHandler) {