Spawn position tweak and stray test unit