Restructure logout spec