Did some changes and used expected error as an argument for one data-set.
https://www.refheap.com/paste/12077

Please review it..if it looks okay then I'll merge the changes to this PR.