went back to indexed messages for tests