cleanup, fix test command