update files

Update  test files
add few fixes