Got most of device model tests passing