Merge and improve the canPlayType tests