Added more tests and made small edits in MP model creation