Add restart test. Update comments