Stragglers here and there but test mostly