Ianoc/scalding 210

Brings @jcoveney and my old stuff up to date
The other ones are test only, here its for build + test. (None of this should be new I don't think?)
I cleaned up a little of it. But maybe as a follow up PR we can take a pass at what we'd want to do with cleaning this up in general?