Continue updating the unit tests