Merge "Unit tests for ExpiryRecord"