         test.isTrue circularFirstId
         @circularFirstId = circularFirstId
 
-    # Sleep so that observers have time to update documents
-    Meteor.setTimeout expect(), WAIT_TIME
+    # Wait so that observers have time to update documents
+    waitForDatabase test, expect
 ,
   (test, expect) ->
     if Meteor.isServer and Document.instances is 1

        test.isFalse error, error?.toString?() or error
        test.isTrue res

    # Sleep so that observers have time to update documents
    Meteor.setTimeout expect(), WAIT_TIME
,
  (test, expect) ->
    @person1 = Person.documents.findOne @person1Id,

        test.isFalse error, error?.toString?() or error
        test.isTrue res

    # Wait so that observers have time to update documents
    waitForDatabase test, expect
,
  (test, expect) ->
    @person1 = Person.documents.findOne @person1Id,
