Move collection to database, with revised tests