you're correct. those are the 2 most common types of solubility questions they will ask on the DAT. remember, for covalent compounds "like dissolves like".... so non-polar solutes are soluble in non-polar solvents, and polar solutes are soluble in polar solvents...
jb!🙂