Upgrade contam tests

@macumber This is the upgrade to the CONTAM testing we talked about. There are probably a few more things that could be checked, but I think this gets most of the important stuff. I'm not sure if I did the resource addition properly, so you may want to look at that pretty closely.