More model testing

Getting close!