новые utests + some fixes