ScoreIndexerTest and MessageFactory adjusted