Reworking test for done (no need to query if there is no data)