some changes of the filenames and tests