Refactor to use simple simple test with 2M messages.