More replacing queries with fixtures