remove warnings, fix (most) model tests