Clean up some tests to get rid of getById usage
Clean up some tests to get rid of getById usage

liujimj/fireplace,Meerkov/fireplace,oftc-ftw/fireplace,liujimj/fireplace,Ragowit/fireplace,butozerca/fireplace,butozerca/fireplace,amw2104/fireplace,oftc-ftw/fireplace,Meerkov/fireplace,smallnamespace/fireplace,smallnamespace/fireplace,amw2104/fireplace,jleclanche/fireplace,beheh/fireplace,NightKev/fireplace,Ragowit/fireplace