correct non matching #ifndef #define
Fixed data and checks for a few tests.
remove debug output, change error message text
Merge branch 'R01030x-branch'
Merge remote-tracking branch 'official/master'
initial version of credit risk plus model