modify to enhance tests
remove deprecated files to be refactored