Update tests to incorporate the latest library changes