Cleanup and finished 10 unit tests