Add extra tests to model extraction