Added test for restart method
Final changes prior to commit