B-48286 Updated unit tests