Comments added
Test files updated