diff --git a/src/Mapless-Mongo-Tests/MaplessMongoAPITest.class.st b/src/Mapless-Mongo-Tests/MaplessMongoAPITest.class.st
new file mode 100644
index 0000000..c2dd201
--- /dev/null
+++ b/src/Mapless-Mongo-Tests/MaplessMongoAPITest.class.st
@@ -0,0 +1,31 @@
+Class {
+	#name : #MaplessMongoAPITest,
+	#superclass : #MaplessTestCase,
+	#category : #'Mapless-Mongo-Tests-Tests'
+}
+
+{ #category : #tests }
+MaplessMongoAPITest >> testConnectUsingMongoUrl [
+
+	| api mongoUrl |
+	api := MongoAPI mongoUrl: 'mongodb://localhost:27017/Mapless-Test'.
+	api open.
+	self assert: api isValid.
+	api close.
+	self deny: api isValid.
+	mongoUrl := ZnUrl fromString: 'mongodb://localhost:27017'.
+	self assert: api asMongoUrl equals: mongoUrl.
+
+	self assert: (api isAt: mongoUrl)
+]
+
+{ #category : #tests }
+MaplessMongoAPITest >> testGetMongoInfo [
+
+	| api |
+	api := MongoAPI mongoUrl: 'mongodb://localhost:27017/Mapless-Test'.
+	api open.
+
+	self assert: api admin isMaster class equals: MongoIsMaster.
+	api close
+]
diff --git a/src/Mapless-Redis-Tests/MaplessRedisTest.class.st b/src/Mapless-Redis-Tests/MaplessRedisTest.class.st
index 663677a..81fb464 100644
--- a/src/Mapless-Redis-Tests/MaplessRedisTest.class.st
+++ b/src/Mapless-Redis-Tests/MaplessRedisTest.class.st
@@ -858,7 +858,7 @@ MaplessRedisTest >> testUpdatingExpire [
 	found := repository findOne: SamplePerson atId: guy id.
 	self assert: found notNil.
 	repository expires: guy in: 900.
-	10 milliSeconds asDelay wait.  
+	30 milliSeconds asDelay wait.  
 	howMuchWillItBeThere := repository ttlFor: guy.
 	self assert: howMuchWillItBeThere > 0.
 	answer := repository expires: guy in: 2500.