Modify with new test filename
Remove some bug files