added fi comments and some changes TestD