Cleanup and test suite work

Finishing up the merge of everyone’s work so far; fixed up a bunch of
specs, fixed some style issues throughout, and rehabbing specs to be
correct (and generally passing).