Ianoc/scalding 210

Brings @jcoveney and my old stuff up to date
just saw that you were using === in some of the tests at the top of the diff then switched to the "should be" / "should haves" later (or maybe it's your vs. jco's branch), so ideally we'd just stick with one but not a huge deal.

I don't particularly like the english sentence style assertions, === is short and is pretty clear IMO.