add test
some changes