remove old files, modify test