reorganized filenames and add list tests