@dmitchell wouldn't it be better if these two very similar tests had common code or could be combined into a single test?