I like the change to group related tests together.  Wondering if this file is getting long enough that we should separate these blocks of tests into their own namespaces instead?