Begin updating unit tests