Merge "Unit tests for Override default assistant"