import freenet.support.SimpleFieldSet
import net.pterodactylus.sone.core.Core
-import net.pterodactylus.sone.test.asOptional
import net.pterodactylus.sone.test.whenever
+import net.pterodactylus.sone.utils.asOptional
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.containsInAnyOrder
import org.hamcrest.Matchers.equalTo