Added some additional checks
Added some additional checks

cpputest/cpputest,basvodde/cpputest,basvodde/cpputest,cpputest/cpputest,basvodde/cpputest,basvodde/cpputest,offa/cpputest,offa/cpputest,offa/cpputest,cpputest/cpputest,cpputest/cpputest,offa/cpputest