Merge "Add unit tests for MultiStateCallback" into main