Finished unit test, and completed clean up. Final Commit