update files and tests