CIR type and matlab tests added