SP and MP model tests and options change.
Merge pull request #211 from dyxliang/master

Pull update.