[#2407] Minor tweaks to testing with the database entry