Fix Travis: get rid of all by.model() calls