Merge "Unit tests for Multi-Default with Existing APIs"