Continued updates of unit tests