fix state issue
skip two test for now
graceful shutdown