Fix/oonibclient

This is useful for testing oonibclient.