Finish updating unit tests