Working on updating unit tests