Just moving around some tests to be more logically grouped.
Thanks leahculver for the suggestion and dc and vajrasky for work on the patch.