Added some tests.
Completed changeover allow for the process exiting normally.