Revise db/collection access PHP-667 test