Switch to using modules for tests.