Tests, some changes