Revert "Deciding to break up tests"

This reverts commit 7ef1c4d3cda334c9297c2671c9e89366ddc0d3a7.