Fix bugs so as to pass test
Delete renamed file