Some fixed tests
some changes