Added flt queries
Enhanced test coverage