Add/Correct for true FMQL pull tests and clean up of static tests naming.