B-48287 Updated unit tests