some fixes on serve tests