Broke up the tests into separate modules.