Message length test adjustements