Merge "Small tweaks to media handler tests"