More updates to unit tests