some change and fixed test part