ContentAdapter api is now #toCursor(). Also clean up tests