removed tests, some changes