Fixed querry to fit our standards. Test still fails