The split probably won't happen for a while, but I might as well lay the
groundwork now since I'll be adding new test modules before too long.