I will let you figure out what is best for your project, but you may want to look at compressed air foam. You wont have the discharge test issues you are concerned with. I am definitely not a subject matter on foam, but I did some prelim research about 6 months ago on it and wrote an initial design spec for a foam system. It is <FM> approved, and can be used for flammable liquids. The project we had involved very low fp liquids in plastic containers, so we had to have foam, since water alone would not cut it. But, the project was cancelled early on so it did not go through.