fix rights
modify test
merge