Add meaningful tests to the FT GTest
Minor clean up
Merge pull request #728 from jasondegraw/upgrade-CONTAM-tests

Upgrade contam tests

@jasondegraw, excellent!