B-48288 Updated unit tests