added more test options
Merge branch 'master' of github.com:cjrd/MEIBP