improve coverage and fix calling stop against stopped server.